diff --git a/.drone.yml b/.drone.yml
index ae225ba..20cf298 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -27,7 +27,7 @@ steps:
     dockerfile: pepeservice/Dockerfile
     repo: dutchellie/pepebot_service
     tags:
-      - latest
+      - latest-x86
 
 ---
 
@@ -60,4 +60,38 @@ steps:
     dockerfile: pepeservice/Dockerfile
     repo: dutchellie/pepebot_service
     tags:
-      - latest
\ No newline at end of file
+      - latest-arm64
+
+---
+
+kind: pipeline
+type: kubernetes
+name: manifest
+
+steps:
+- name: manifest-main
+  image: plugins/manifest
+  settings:
+    platforms:
+      - linux/x86
+      - linux/arm64
+    target: dutchellie/pepebot
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+- name: manifest-pepebotservice
+  image: plugins/manifest
+  settings:
+    platforms:
+      - linux/x86
+      - linux/arm64
+    target: dutchellie/pepebot_service
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+
+depends_on:
+  - pepebot_build_arm64
+  - pepebot_build_x86
\ No newline at end of file