diff --git a/.drone.yml b/.drone.yml
index cce42ca1..f0f03660 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -53,7 +53,24 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      target: "[dessalines/lemmy-ui:${DRONE_TAG}, dessalines/lemmy-ui:latest]"
+      target: "dessalines/lemmy-ui:${DRONE_TAG}"
+      template: "dessalines/lemmy-ui:${DRONE_TAG}-OS-ARCH"
+      platforms:
+        - linux/amd64
+        - linux/arm64
+      ignore_missing: true
+    when:
+      ref:
+      - refs/tags/*
+
+  - name: publish latest release docker manifest
+    image: plugins/manifest
+    settings: 
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      target: "dessalines/lemmy-ui:latest"
       template: "dessalines/lemmy-ui:${DRONE_TAG}-OS-ARCH"
       platforms:
         - linux/amd64
@@ -116,3 +133,20 @@ steps:
     when:
       ref:
       - refs/tags/*
+
+  - name: publish latest release docker manifest
+    image: plugins/manifest
+    settings: 
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      target: "dessalines/lemmy-ui:latest"
+      template: "dessalines/lemmy-ui:${DRONE_TAG}-OS-ARCH"
+      platforms:
+        - linux/amd64
+        - linux/arm64
+      ignore_missing: true
+    when:
+      ref:
+      - refs/tags/*