diff --git a/.drone.jsonnet b/.drone.jsonnet
index e77c34c..f0caa53 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -27,6 +27,17 @@ local PipelineBuildContainer(arch='amd64') = {
     arch: 'amd64',
   },
   steps: [
+    {
+      name: 'tags',
+      image: 'thegeeklab/docker-autotag',
+      environment: {
+        DOCKER_AUTOTAG_FORCE_LATEST: 'True',
+        DOCKER_AUTOTAG_IGNORE_PRERELEASE: 'True',
+        DOCKER_AUTOTAG_OUTPUT_FILE: '.tags',
+        DOCKER_AUTOTAG_VERSION: '${DRONE_TAG}',
+        DOCKER_AUTOTAG_SUFFIX: std.split(arch, '_')[0],
+      },
+    },
     {
       name: 'dryrun',
       image: 'thegeeklab/drone-docker-buildx',
@@ -41,22 +52,11 @@ local PipelineBuildContainer(arch='amd64') = {
         username: { from_secret: 'docker_username' },
         password: { from_secret: 'docker_password' },
       },
+      depends_on: ['tags'],
       when: {
         ref: ['refs/pull/**'],
       },
     },
-    {
-      name: 'tags',
-      image: 'thegeeklab/docker-autotag',
-      environment: {
-        DOCKER_AUTOTAG_FORCE_LATEST: 'True',
-        DOCKER_AUTOTAG_IGNORE_PRERELEASE: 'True',
-        DOCKER_AUTOTAG_OUTPUT_FILE: '.tags',
-        DOCKER_AUTOTAG_VERSION: '${DRONE_TAG}',
-        DOCKER_AUTOTAG_SUFFIX: std.split(arch, '_')[0],
-      },
-      depends_on: ['dryrun'],
-    },
     {
       name: 'publish-dockerhub',
       image: 'thegeeklab/drone-docker-buildx',
diff --git a/.drone.yml b/.drone.yml
index 618f2d0..4464f2b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -27,6 +27,15 @@ platform:
   arch: amd64
 
 steps:
+- name: tags
+  image: thegeeklab/docker-autotag
+  environment:
+    DOCKER_AUTOTAG_FORCE_LATEST: True
+    DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
+    DOCKER_AUTOTAG_OUTPUT_FILE: .tags
+    DOCKER_AUTOTAG_SUFFIX: amd64
+    DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
+
 - name: dryrun
   image: thegeeklab/drone-docker-buildx
   settings:
@@ -43,17 +52,8 @@ steps:
   when:
     ref:
     - refs/pull/**
-
-- name: tags
-  image: thegeeklab/docker-autotag
-  environment:
-    DOCKER_AUTOTAG_FORCE_LATEST: True
-    DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
-    DOCKER_AUTOTAG_OUTPUT_FILE: .tags
-    DOCKER_AUTOTAG_SUFFIX: amd64
-    DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
   depends_on:
-  - dryrun
+  - tags
 
 - name: publish-dockerhub
   image: thegeeklab/drone-docker-buildx
@@ -89,6 +89,15 @@ platform:
   arch: amd64
 
 steps:
+- name: tags
+  image: thegeeklab/docker-autotag
+  environment:
+    DOCKER_AUTOTAG_FORCE_LATEST: True
+    DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
+    DOCKER_AUTOTAG_OUTPUT_FILE: .tags
+    DOCKER_AUTOTAG_SUFFIX: arm64
+    DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
+
 - name: dryrun
   image: thegeeklab/drone-docker-buildx
   settings:
@@ -105,17 +114,8 @@ steps:
   when:
     ref:
     - refs/pull/**
-
-- name: tags
-  image: thegeeklab/docker-autotag
-  environment:
-    DOCKER_AUTOTAG_FORCE_LATEST: True
-    DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
-    DOCKER_AUTOTAG_OUTPUT_FILE: .tags
-    DOCKER_AUTOTAG_SUFFIX: arm64
-    DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
   depends_on:
-  - dryrun
+  - tags
 
 - name: publish-dockerhub
   image: thegeeklab/drone-docker-buildx
@@ -151,6 +151,15 @@ platform:
   arch: amd64
 
 steps:
+- name: tags
+  image: thegeeklab/docker-autotag
+  environment:
+    DOCKER_AUTOTAG_FORCE_LATEST: True
+    DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
+    DOCKER_AUTOTAG_OUTPUT_FILE: .tags
+    DOCKER_AUTOTAG_SUFFIX: arm
+    DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
+
 - name: dryrun
   image: thegeeklab/drone-docker-buildx
   settings:
@@ -167,17 +176,8 @@ steps:
   when:
     ref:
     - refs/pull/**
-
-- name: tags
-  image: thegeeklab/docker-autotag
-  environment:
-    DOCKER_AUTOTAG_FORCE_LATEST: True
-    DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
-    DOCKER_AUTOTAG_OUTPUT_FILE: .tags
-    DOCKER_AUTOTAG_SUFFIX: arm
-    DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
   depends_on:
-  - dryrun
+  - tags
 
 - name: publish-dockerhub
   image: thegeeklab/drone-docker-buildx
@@ -273,6 +273,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: fbd638a430ac4086311b3be3f9a97296d08bb108e4d0b2d339de75b0814562e6
+hmac: c11c306a6ff27ebe6ffe119cda6ec0afd5b8426ccb72c3a71cd6209782634451
 
 ...