diff --git a/.drone.jsonnet b/.drone.jsonnet
index 509725a..b63aed8 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -74,9 +74,7 @@ local PipelineBuildContainer(arch='amd64') = {
       name: 'publish-quay',
       image: 'thegeeklab/drone-docker:19',
       settings: {
-        auto_tag: true,
-        auto_tag_suffix: arch,
-        dockerfile: 'Dockerfile.' + arch,
+        dockerfile: 'Dockerfile.' + std.split(arch, '_')[0],
         registry: 'quay.io',
         repo: 'quay.io/thegeeklab/${DRONE_REPO_NAME}',
         username: { from_secret: 'quay_username' },
@@ -122,7 +120,6 @@ local PipelineNotifications = {
       name: 'manifest-quay',
       settings: {
         ignore_missing: true,
-        auto_tag: true,
         username: { from_secret: 'quay_username' },
         password: { from_secret: 'quay_password' },
         spec: 'manifest-quay.tmpl',
diff --git a/.drone.yml b/.drone.yml
index c2fe984..d4f4117 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -73,8 +73,6 @@ steps:
 - name: publish-quay
   image: thegeeklab/drone-docker:19
   settings:
-    auto_tag: true
-    auto_tag_suffix: amd64
     dockerfile: Dockerfile.amd64
     password:
       from_secret: quay_password
@@ -153,9 +151,7 @@ steps:
 - name: publish-quay
   image: thegeeklab/drone-docker:19
   settings:
-    auto_tag: true
-    auto_tag_suffix: arm64_v8
-    dockerfile: Dockerfile.arm64_v8
+    dockerfile: Dockerfile.arm64
     password:
       from_secret: quay_password
     registry: quay.io
@@ -233,9 +229,7 @@ steps:
 - name: publish-quay
   image: thegeeklab/drone-docker:19
   settings:
-    auto_tag: true
-    auto_tag_suffix: arm_v7
-    dockerfile: Dockerfile.arm_v7
+    dockerfile: Dockerfile.arm
     password:
       from_secret: quay_password
     registry: quay.io
@@ -283,7 +277,6 @@ steps:
 - name: manifest-quay
   image: plugins/manifest
   settings:
-    auto_tag: true
     ignore_missing: true
     password:
       from_secret: quay_password
@@ -353,6 +346,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: af32284553808c162e71b2c97532c9f78821f88035b2030c97eba15c63585c11
+hmac: ac69e7362831195957a0d9831ea3df174403714a25ed5ce7ec4cb66168d98fb5
 
 ...