diff --git a/.drone.yml b/.drone.yml
index ba2ef1fb7..550db4c67 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -55,7 +55,7 @@ steps:
       - yarn
       - yarn api-test
 
-  - name: make release build and push to docker hub
+  - name: build latest development version and push to docker hub
     image: plugins/docker
     settings:
       dockerfile: docker/prod/Dockerfile
@@ -64,29 +64,48 @@ steps:
       password:
         from_secret: docker_password
       repo: dessalines/lemmy
-      auto_tag: true
-      auto_tag_suffix: linux-amd64
+      tags:
+        - dev
     when:
-      ref:
-      - refs/tags/*
+      branch:
+        include:
+          - main
+          - drone-release-main
 
-  - name: build latest development version and push to docker hub
-    image: plugins/docker
+  - name: push to docker manifest
+    image: plugins/manifest
     settings:
-      dockerfile: docker/prod/Dockerfile
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      repo: dessalines/lemmy
-      tags:
-        - dev
+      target: "dessalines/lemmy:dev"
+      template: "dessalines/lemmy:dev-OS-ARCH"
+      platforms:
+        - linux/amd64
+        - linux/arm64
+      ignore_missing: true
     when:
       branch:
         include:
           - main
           - drone-release-main
 
+  - name: make release build and push to docker hub
+    image: plugins/docker
+    settings:
+      dockerfile: docker/prod/Dockerfile
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: dessalines/lemmy
+      auto_tag: true
+      auto_tag_suffix: linux-amd64
+    when:
+      ref:
+      - refs/tags/*
+
   - name: push to docker manifest
     image: plugins/manifest
     settings: 
@@ -157,6 +176,42 @@ steps:
       - yarn
       - yarn api-test
 
+  - name: build latest development version and push to docker hub
+    image: plugins/docker
+    settings:
+      dockerfile: docker/prod/Dockerfile.arm
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: dessalines/lemmy
+      tags:
+        - dev
+    when:
+      branch:
+        include:
+          - main
+          - drone-release-main
+
+  - name: push to docker manifest
+    image: plugins/manifest
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      target: "dessalines/lemmy:${DRONE_TAG}"
+      template: "dessalines/lemmy:${DRONE_TAG}-OS-ARCH"
+      platforms:
+        - linux/amd64
+        - linux/arm64
+      ignore_missing: true
+    when:
+      branch:
+        include:
+          - main
+          - drone-release-main
+
   - name: make release build and push to docker hub
     image: plugins/docker
     settings: