diff --git a/.drone.yml b/.drone.yml
index 17ff60f..792b772 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,24 +2,27 @@ kind: pipeline
 type: docker
 name: default
 
+volumes:
+  - name: dockersock
+    host:
+      path: /var/run/docker.sock
+
 steps:
-  - name: build-docker
-    image: plugins/docker
-    settings:
-      registry: 192.168.1.9:3000
-      repo: 192.168.1.9:3000/tai/aberwyn/aberwyn
-      username:
-        from_secret: gitea_username
-      password:
-        from_secret: gitea_token
-      dockerfile: Aberwyn/Dockerfile
-      context: .
-      tags:
-        - latest
-        - ${DRONE_COMMIT_SHA:0:7}
-      cache_from:
-        - 192.168.1.9:3000/tai/aberwyn/aberwyn:latest
-      insecure: true
+  - name: docker-build
+    image: docker:24
+    volumes:
+      - name: dockersock
+        path: /var/run/docker.sock
+    commands:
+      - docker buildx create --use || true
+      - docker login 192.168.1.9:3000 -u $GITEA_USERNAME -p $GITEA_TOKEN
+      - docker buildx build \
+          --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:latest \
+          --tag 192.168.1.9:3000/tai/aberwyn/aberwyn:${DRONE_COMMIT_SHA:0:7} \
+          --cache-from=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache \
+          --cache-to=type=registry,ref=192.168.1.9:3000/tai/aberwyn/aberwyn:buildcache,mode=max \
+          --push \
+          -f Aberwyn/Dockerfile .
 
   - name: restart-unraid-container
     image: appleboy/drone-ssh