diff --git a/.drone.yml b/.drone.yml
index 8ce048a2..f4adde60 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -282,3 +282,31 @@ steps:
       auto_tag: true
       auto_tag_suffix: linux-amd64
     depends_on: [ fetch-tags ]
+
+---
+kind: pipeline
+type: docker
+name: docker-manifest
+
+trigger:
+  ref:
+    - refs/heads/master
+    - "refs/tags/**"
+
+depends_on:
+  - docker-amd64-latest
+  - docker-arm-latest
+
+steps:
+  - name: manifest
+    pull: always
+    image: plugins/manifest
+    settings:
+      auto_tag: true
+      ignore_missing: true
+      spec: docker-manifest.tmpl
+      password:
+        from_secret: docker_password
+      username:
+        from_secret: docker_username
+
diff --git a/docker-manifest.tmpl b/docker-manifest.tmpl
new file mode 100644
index 00000000..4d12a36a
--- /dev/null
+++ b/docker-manifest.tmpl
@@ -0,0 +1,18 @@
+image: vikunja/frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: vikunja/frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: vikunja/frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
+    platform:
+      architecture: arm
+      os: linux