diff --git a/.drone.yml b/.drone.yml
index 20cf298..a4b291c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -16,7 +16,7 @@ steps:
     dockerfile: Dockerfile
     repo: dutchellie/pepebot
     tags:
-      - latest
+      - latest-amd64
 - name: build-service
   image: plugins/docker
   settings:
@@ -27,7 +27,7 @@ steps:
     dockerfile: pepeservice/Dockerfile
     repo: dutchellie/pepebot_service
     tags:
-      - latest-x86
+      - latest-amd64
 
 ---
 
@@ -49,7 +49,7 @@ steps:
     dockerfile: Dockerfile
     repo: dutchellie/pepebot
     tags:
-      - latest
+      - latest-arm64
 - name: build-service
   image: plugins/docker
   settings:
@@ -73,9 +73,10 @@ steps:
   image: plugins/manifest
   settings:
     platforms:
-      - linux/x86
+      - linux/amd64
       - linux/arm64
-    target: dutchellie/pepebot
+    target: dutchellie/pepebot:latest
+    template: dutchellie/pepebot:latest-ARCH
     username:
       from_secret: docker_username
     password:
@@ -84,9 +85,10 @@ steps:
   image: plugins/manifest
   settings:
     platforms:
-      - linux/x86
+      - linux/amd64
       - linux/arm64
-    target: dutchellie/pepebot_service
+    target: dutchellie/pepebot_service:latest
+    template: dutchellie/pepebot_service:latest-ARCH
     username:
       from_secret: docker_username
     password: