diff --git a/.drone.yml b/.drone.yml
index 6fe651b..9261e57 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,10 +1,12 @@
 ---
 kind: pipeline
 type: docker
-name: default
+name: amd64
+
+platform:
+  arch: amd64
 
 steps:
-
 - name: ko
   image: gcr.io/kaniko-project/executor:debug
   network_mode: host
@@ -47,7 +49,7 @@ steps:
     GITEA_TOKEN:
       from_secret: gitea_token
     IMAGE_REPO: code.icb4dc0.de/prskr/ci-images/caddy
-    IMAGE_TAG: latest
+    IMAGE_TAG: x86_64
     BUILD_CONTEXT: caddy/
 
 - name: renovate
@@ -63,4 +65,56 @@ steps:
       from_secret: gitea_token
     IMAGE_REPO: code.icb4dc0.de/prskr/ci-images/renovate
     IMAGE_TAG: latest
-    BUILD_CONTEXT: renovate/
\ No newline at end of file
+    BUILD_CONTEXT: renovate/
+
+---
+kind: pipeline
+type: docker
+name: arm64
+
+platform:
+  arch: arm64
+
+steps:
+- name: caddy
+  image: gcr.io/kaniko-project/executor:debug
+  network_mode: host
+  commands:
+    - >
+      echo "{\"auths\": {\"https://code.icb4dc0.de\": {\"auth\" : \"$(printf '%s:%s' $$GITEA_USER $$GITEA_TOKEN | base64)\" }}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --destination "$${IMAGE_REPO}:$${IMAGE_TAG}" --context "$${BUILD_CONTEXT}"
+  environment:
+    GITEA_USER: prskr
+    GITEA_TOKEN:
+      from_secret: gitea_token
+    IMAGE_REPO: code.icb4dc0.de/prskr/ci-images/caddy
+    IMAGE_TAG: arm64
+    BUILD_CONTEXT: caddy/
+
+---
+kind: pipeline
+type: docker
+name: manifests
+
+depends_on:
+  - amd64
+  - arm64
+
+steps:
+- name: caddy
+  image: quay.io/buildah/stable
+  network_mode: host
+  privileged: true
+  commands:
+    - buildah login "$${IMAGE_REGISTRY}" --username "$${GITEA_USER}" --password "$${GITEA_TOKEN}"
+    - buildah manifest create "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:$${IMAGE_TAG}"
+    - buildah manifest add "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:$${IMAGE_TAG}" "docker://$${IMAGE_REGISTRY}/$${IMAGE_REPO}:x86_64"
+    - buildah manifest add "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:$${IMAGE_TAG}" "docker://$${IMAGE_REGISTRY}/$${IMAGE_REPO}:arm64"
+    - buildah manifest push --all "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:$${IMAGE_TAG}" "docker://$${IMAGE_REGISTRY}/$${IMAGE_REPO}:$${IMAGE_TAG}"
+  environment:
+    GITEA_USER: prskr
+    GITEA_TOKEN:
+      from_secret: gitea_token
+    IMAGE_REGISTRY: code.icb4dc0.de
+    IMAGE_REPO: prskr/ci-images/caddy
+    IMAGE_TAG: latest
\ No newline at end of file