diff --git a/.drone.yml b/.drone.yml
index eacbef0..d31c22d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -134,7 +134,7 @@ steps:
     repo: asonix/pictrs
     dockerfile: docker/drone/Dockerfile
     auto_tag: true
-    auto_tag_suffix: amd64
+    auto_tag_suffix: linux-amd64
     build_args:
     - REPO_ARCH=amd64
     - TARGET_ARCH=x86_64-unknown-linux-musl
@@ -213,7 +213,7 @@ steps:
     repo: asonix/pictrs
     dockerfile: docker/drone/Dockerfile
     auto_tag: true
-    auto_tag_suffix: arm64v8
+    auto_tag_suffix: linux-arm64v8
     build_args:
     - REPO_ARCH=arm64v8
     - TARGET_ARCH=aarch64-unknown-linux-musl
@@ -292,7 +292,7 @@ steps:
     repo: asonix/pictrs
     dockerfile: docker/drone/Dockerfile
     auto_tag: true
-    auto_tag_suffix: arm32v7
+    auto_tag_suffix: linux-arm32v7
     build_args:
     - REPO_ARCH=arm32v7
     - TARGET_ARCH=armv7-unknown-linux-musleabifh
diff --git a/docker/drone/manifest.tmpl b/docker/drone/manifest.tmpl
index 7560ec2..0660261 100644
--- a/docker/drone/manifest.tmpl
+++ b/docker/drone/manifest.tmpl
@@ -2,21 +2,24 @@ image: asonix/pictrs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
-- {{this}}
+  - {{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
+  -
+    image: asonix/pictrs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: asonix/pictrs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64v8
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8
+  -
+    image: asonix/pictrs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-armv7
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7