diff --git a/.drone.yml b/.drone.yml
index 01357dd..849c3ae 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,6 +14,7 @@ steps:
       from_secret: github_token
   commands:
   - dapper ci
+  - echo "${DRONE_TAG}-amd64" | sed -e 's/+/-/g' >.tags
   volumes:
   - name: docker
     path: /var/run/docker.sock
@@ -102,4 +103,35 @@ steps:
 volumes:
 - name: docker
   host:
-    path: /var/run/docker.sock
\ No newline at end of file
+    path: /var/run/docker.sock
+---
+kind: pipeline
+type: docker
+name: manifest
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: push-runtime-manifest
+    image: plugins/manifest
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      spec: manifest-runtime.tmpl
+    when:
+      event:
+        - tag
+      instance:
+        - drone-publish.rancher.io
+      ref:
+        - refs/head/master
+        - refs/tags/*
+      branch:
+        exclude:
+        - k3k-chart
+depends_on:
+  - amd64
\ No newline at end of file
diff --git a/manifest-runtime.tmpl b/manifest-runtime.tmpl
new file mode 100644
index 0000000..05a21a6
--- /dev/null
+++ b/manifest-runtime.tmpl
@@ -0,0 +1,6 @@
+image: rancher/k3k:{{replace "+" "-" build.tag}}
+manifests:
+  - image: rancher/k3k:{{replace "+" "-" build.tag}}-amd64
+    platform: 
+      architecture: amd64
+      os: linux
\ No newline at end of file