diff --git a/.drone.yml b/.drone.yml
index 7a256c5..63051d5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -213,7 +213,7 @@ steps:
     repo: asonix/pictrs
     dockerfile: docker/drone/Dockerfile
     auto_tag: true
-    auto_tag_suffix: arv64v8
+    auto_tag_suffix: arm64v8
     build_args:
     - REPO_ARCH=arm64v8
     - TARGET_ARCH=aarch64-unknown-linux-musl
@@ -300,3 +300,36 @@ steps:
 trigger:
   event:
   - tag
+
+---
+
+kind: pipeline
+type: docker
+name: build-arm32v7
+
+platform:
+  arch: amd64
+
+clone:
+  disable: true
+
+steps:
+- name: manifest
+  image: plugins/manifest
+  settings:
+    username: asonix
+    password:
+      from_secret: dockerhub_token
+    auto_tag: true
+    ignore_missing: true
+    spec: docker/drone/manifest.tmpl
+
+
+depends_on:
+- build-amd64
+- build-arm64v8
+- build-arm32v7
+
+trigger:
+  event:
+  - tag
diff --git a/docker/drone/manifest.tmpl b/docker/drone/manifest.tmpl
new file mode 100644
index 0000000..e2fca79
--- /dev/null
+++ b/docker/drone/manifest.tmpl
@@ -0,0 +1,25 @@
+image: asonix/pictrs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: asonix/pictrs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: asonix/pictrs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64v8
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8
+  -
+    image: asonix/pictrs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm32v7
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7