diff --git a/.drone.jsonnet b/.drone.jsonnet
index 090f0c2..b08b26f 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -35,6 +35,7 @@ local PipelineBuildContainer(version='7') = {
         dry_run: true,
         dockerfile: 'Dockerfile.rh' + version,
         repo: 'thegeeklab/${DRONE_REPO_NAME}',
+        tags: version,
       },
       when: {
         ref: ['refs/pull/**'],
@@ -49,6 +50,7 @@ local PipelineBuildContainer(version='7') = {
         repo: 'thegeeklab/${DRONE_REPO_NAME}',
         username: { from_secret: 'docker_username' },
         password: { from_secret: 'docker_password' },
+        tags: version,
       },
       when: {
         ref: ['refs/heads/main', 'refs/tags/**'],
@@ -87,32 +89,6 @@ local PipelineNotifications = {
     arch: 'amd64',
   },
   steps: [
-    {
-      image: 'plugins/manifest',
-      name: 'manifest-dockerhub',
-      settings: {
-        ignore_missing: true,
-        username: { from_secret: 'docker_username' },
-        password: { from_secret: 'docker_password' },
-        spec: 'manifest.tmpl',
-      },
-      when: {
-        status: ['success'],
-      },
-    },
-    {
-      image: 'plugins/manifest',
-      name: 'manifest-quay',
-      settings: {
-        ignore_missing: true,
-        username: { from_secret: 'quay_username' },
-        password: { from_secret: 'quay_password' },
-        spec: 'manifest-quay.tmpl',
-      },
-      when: {
-        status: ['success'],
-      },
-    },
     {
       name: 'pushrm-dockerhub',
       pull: 'always',
diff --git a/.drone.yml b/.drone.yml
index c680ce6..f63d3cc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -34,6 +34,7 @@ steps:
       dockerfile: Dockerfile.rh7
       dry_run: true
       repo: thegeeklab/${DRONE_REPO_NAME}
+      tags: 7
     when:
       ref:
         - refs/pull/**
@@ -46,6 +47,7 @@ steps:
       password:
         from_secret: docker_password
       repo: thegeeklab/${DRONE_REPO_NAME}
+      tags: 7
       username:
         from_secret: docker_username
     when:
@@ -95,6 +97,7 @@ steps:
       dockerfile: Dockerfile.rh8
       dry_run: true
       repo: thegeeklab/${DRONE_REPO_NAME}
+      tags: 8
     when:
       ref:
         - refs/pull/**
@@ -107,6 +110,7 @@ steps:
       password:
         from_secret: docker_password
       repo: thegeeklab/${DRONE_REPO_NAME}
+      tags: 8
       username:
         from_secret: docker_username
     when:
@@ -149,32 +153,6 @@ platform:
   arch: amd64
 
 steps:
-  - name: manifest-dockerhub
-    image: plugins/manifest
-    settings:
-      ignore_missing: true
-      password:
-        from_secret: docker_password
-      spec: manifest.tmpl
-      username:
-        from_secret: docker_username
-    when:
-      status:
-        - success
-
-  - name: manifest-quay
-    image: plugins/manifest
-    settings:
-      ignore_missing: true
-      password:
-        from_secret: quay_password
-      spec: manifest-quay.tmpl
-      username:
-        from_secret: quay_username
-    when:
-      status:
-        - success
-
   - name: pushrm-dockerhub
     pull: always
     image: chko/docker-pushrm:1
@@ -233,6 +211,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 474bbbb50ad73c8e3fb3c9047caabeefaf91f311582963e508503405b652af5d
+hmac: b735c9a4920f6b625647df0385d063ba5cc136c21169e17c490b166db1ab6f1c
 
 ...