diff --git a/.drone.yml b/.drone.yml
index cdffb63..18811ba 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -95,4 +95,27 @@ volumes:
 - name: docker
   host:
     path: /var/run/docker.sock
-...
+
+---
+kind: pipeline
+type: docker
+name: manifest
+platform:
+  os: linux
+  arch: amd64
+steps:
+- name: push
+  image: plugins/manifest:1.2.3
+  settings:
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    spec: manifest.tmpl
+    ignore_missing: true
+  when:
+    event:
+    - tag
+depends_on:
+- linux-amd64
+- linux-arm64
diff --git a/manifest.tmpl b/manifest.tmpl
new file mode 100644
index 0000000..1047af7
--- /dev/null
+++ b/manifest.tmpl
@@ -0,0 +1,12 @@
+image: rancher/hardened-ib-sriov-cni:{{build.tag}}
+manifests:
+  -
+    image: rancher/hardened-ib-sriov-cni:{{build.tag}}-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: rancher/hardened-ib-sriov-cni:{{build.tag}}-arm64
+    platform:
+      architecture: arm64
+      os: linux