diff --git a/.drone.yml b/.drone.yml
index 4b13860..69adcd5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,24 +1,3 @@
-
-kind: pipeline
-type: kubernetes
-name: build-amd64
-
-node_selector:
-  kubernetes.io/arch: amd64
-
-steps:
-- name: docker
-  image: plugins/docker
-  settings:
-    repo: badjware/nextcloud-tweak
-    # docker use a mtu of 1500 by default, which may cause packet drop in k8s
-    mtu: 1450
-    auto_tag: true
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
----
 kind: pipeline
 type: kubernetes
 name: build-arm64
@@ -27,14 +6,55 @@ node_selector:
   kubernetes.io/arch: arm64
 
 steps:
-- name: docker
+- name: docker build
   image: plugins/docker
   settings:
-    repo: badjware/nextcloud-tweak
+    repo: ${DRONE_REPO}
+    tag: ${DRONE_COMMIT_SHA:0:8}-arm64
     # docker use a mtu of 1500 by default, which may cause packet drop in k8s
     mtu: 1450
-    auto_tag: true
     username:
       from_secret: docker_username
     password:
-      from_secret: docker_password
\ No newline at end of file
+      from_secret: docker_password
+---
+kind: pipeline
+type: kubernetes
+name: build-amd64
+
+node_selector:
+  kubernetes.io/arch: amd64
+
+steps:
+- name: docker build
+  image: plugins/docker
+  settings:
+    repo: ${DRONE_REPO}
+    tag: ${DRONE_COMMIT_SHA:0:8}-amd64
+    # docker use a mtu of 1500 by default, which may cause packet drop in k8s
+    mtu: 1450
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+---
+kind: pipeline
+type: kubernetes
+name: build-multiarch-manifest
+
+steps:
+  - name: docker manifest
+    image: docker:20-dind-rootless
+    commands:
+      - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
+      - docker manifest create ${DRONE_REPO}:${DRONE_TAG:-latest} --amend ${DRONE_REPO}:${DRONE_COMMIT_SHA:0:8}-amd64 --amend ${DRONE_REPO}:${DRONE_COMMIT_SHA:0:8}-arm64
+      - docker manifest push ${DRONE_REPO}:${DRONE_TAG:-latest}
+    environment: 
+      DOCKER_USERNAME:
+        from_secret: docker_username
+      DOCKER_PASSWORD:
+        from_secret: docker_password
+
+depends_on:
+  - build-arm64
+  - build-amd64
\ No newline at end of file