diff --git a/.drone.yml b/.drone.yml
index 98f3ccb..ae225ba 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,16 +1,63 @@
 kind: pipeline
 type: kubernetes
-name: pepebot_build
+name: pepebot_build_x86
+platform:
+  os: linux
+  arch: amd64
 
 steps:
 - name: build-main
   image: plugins/docker
   settings:
-    registry: dutchellie.nl
     username: 
       from_secret: docker_username
     password:
       from_secret: docker_password
-    repo: dutchellie.nl/dutchellie/pepebot
+    dockerfile: Dockerfile
+    repo: dutchellie/pepebot
+    tags:
+      - latest
+- name: build-service
+  image: plugins/docker
+  settings:
+    username: 
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    dockerfile: pepeservice/Dockerfile
+    repo: dutchellie/pepebot_service
+    tags:
+      - latest
+
+---
+
+kind: pipeline
+type: docker
+name: pepebot_build_arm64
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build-main
+  image: plugins/docker
+  settings:
+    username: 
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    dockerfile: Dockerfile
+    repo: dutchellie/pepebot
+    tags:
+      - latest
+- name: build-service
+  image: plugins/docker
+  settings:
+    username: 
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    dockerfile: pepeservice/Dockerfile
+    repo: dutchellie/pepebot_service
     tags:
       - latest
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 3e0e105..e26911c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   app:
     container_name: pepebot_server
-    image: dutchellie.nl/dutchellie/pepebot
+    image: dutchellie/pepebot
     build: .
     restart: always
     depends_on:
@@ -27,7 +27,7 @@ services:
       - pepe_db_data:/var/lib/mysql
   pepe_service:
     container_name: pepebot_service
-    image: dutchellie.nl/dutchellie/pepebot_service:latest
+    image: dutchellie/pepebot_service:latest
     build: pepeservice
     restart: always
     environment: