diff --git a/.drone.yml b/.drone.yml
index c145139..e53e3ea 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,6 +20,7 @@ steps:
 
 trigger:
   event:
+    - push
     - tag
 
 ---
@@ -45,4 +46,31 @@ steps:
 
 trigger:
   event:
+    - push
     - tag
+
+---
+kind: pipeline
+type: docker
+name: manifest
+
+steps:
+  - name: manifest
+    image: plugins/manifest
+    settings:
+      auto_tag: "true"
+      ignore_missing: "true"
+      spec: manifest.tmpl
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+
+trigger:
+  event:
+    - push
+    - tag
+
+depends_on:
+  - linux-amd64
+  - linux-arm64
diff --git a/manifest.tmpl b/manifest.tmpl
new file mode 100644
index 0000000..2f3661b
--- /dev/null
+++ b/manifest.tmpl
@@ -0,0 +1,19 @@
+image: kichiyaki/caddy:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: kichiyaki/caddy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: kichiyaki/caddy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+    platform:
+      variant: v8
+      architecture: arm64
+      os: linux