diff --git a/.drone.yml b/.drone.yml
index db06f7d..a6c6351 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -125,3 +125,34 @@ trigger:
 #   event:
 #     - tag
 #     - push
+
+---
+kind: pipeline
+type: docker
+name: manifest
+
+steps:
+- name: manifest
+  image: plugins/manifest
+  settings:
+    force_tag: true
+    ignore_missing: true
+    spec: manifest.tmpl
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    tags:
+      - latest
+      - ${DRONE_TAG}
+      - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}
+      - ${DRONE_SEMVER_MAJOR}
+
+trigger:
+  event:
+    - tag
+
+depends_on:
+  - build-amd64
+  - build-arm64
+#  - build-arm
diff --git a/manifest.tmpl b/manifest.tmpl
new file mode 100644
index 0000000..4c49c9e
--- /dev/null
+++ b/manifest.tmpl
@@ -0,0 +1,31 @@
+image: docker.asperti.com/paspo/hassio-zabbix-agent2:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: docker.asperti.com/paspo/hassio-zabbix-agent2:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: docker.asperti.com/paspo/hassio-zabbix-agent2:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}-arm64
+    platform:
+      variant: v8
+      architecture: arm64
+      os: linux
+  -
+    image: docker.asperti.com/paspo/hassio-zabbix-agent2:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}-arm64
+    platform:
+      variant: v8
+      architecture: aarch64
+      os: linux
+  -
+    image: docker.asperti.com/paspo/hassio-zabbix-agent2:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}-arm
+    platform:
+      variant: v7
+      architecture: arm
+      os: linux