diff --git a/.drone.yml b/.drone.yml
index 0e60eb8a..61525604 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -36,6 +36,7 @@ steps:
       dockerfile: Dockerfile
       repo: dessalines/lemmy-ui
       auto_tag: true
+      auto_tag_suffix: linux-amd64
       username:
         from_secret: docker_username
       password:
@@ -44,6 +45,23 @@ steps:
       ref:
         - refs/tags/*
 
+  - name: push to docker manifest
+    image: plugins/manifest
+    settings: 
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      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/*
+
 ---
 kind: pipeline
 name: arm64
@@ -67,7 +85,7 @@ steps:
       dockerfile: Dockerfile
       repo: dessalines/lemmy-ui
       auto_tag: true
-      auto_tag_suffix: arm64
+      auto_tag_suffix: linux-arm64
       username:
         from_secret: docker_username
       password:
@@ -76,3 +94,19 @@ steps:
       ref:
         - refs/tags/*
 
+  - name: push to docker manifest
+    image: plugins/manifest
+    settings: 
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      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/*