diff --git a/.drone.yml b/.drone.yml
index 509a044..7ffac05 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,9 +12,7 @@ steps:
     pull: always
     settings:
       repo: nickslowinski/jts3servermod-dockerized
-      tags:
-        - dev
-        - dev-amd64
+      tags: dev-amd64
       username:
         from_secret: ns_docker_username
       password:
@@ -37,9 +35,7 @@ steps:
     pull: always
     settings:
       repo: nickslowinski/jts3servermod-dockerized
-      tags:
-        - dev
-        - dev-arm64
+      tags: dev-arm64
       username:
         from_secret: ns_docker_username
       password:
@@ -62,13 +58,42 @@ steps:
     pull: always
     settings:
       repo: nickslowinski/jts3servermod-dockerized
-      tags:
-        - dev
-        - dev-arm
+      tags: dev-arm
       username:
         from_secret: ns_docker_username
       password:
         from_secret: ns_docker_password
     when:
       branch:
-        - dev
\ No newline at end of file
+        - dev
+---
+name: post-publish-tasks
+kind: pipeline
+type: docker
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: docker-manifest
+    image: plugins/manifest
+    settings:
+      username:
+        from_secret: ns_docker_username
+      password:
+        from_secret: ns_docker_password
+      target: nickslowinski/jts3servermod-dockerized:dev
+      template: nickslowinski/jts3servermod-dockerized:dev-ARCH
+      platforms:
+        - linux/amd64
+        - linux/arm
+        - linux/arm64
+    when:
+      branch:
+        - dev
+
+depends_on:
+  - build-amd64-dev
+  - build-arm64-dev
+  - build-arm-dev