diff --git a/.drone.yml b/.drone.yml
index a2c89d6f..86e96b94 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,9 +9,10 @@ platform:
 
 steps:
 - name: build
-  image: rancher/dapper:v0.6.0
+  image: docker:25.0.5
   commands:
   - apk add make git bash file
+  - git config --global --add safe.directory /drone/src
   - make
   environment:
     ARCH: "${DRONE_STAGE_ARCH}"
@@ -69,7 +70,7 @@ steps:
     - refs/tags/*
 
 - name: test-image
-  image: rancher/dapper:v0.6.0
+  image: docker:25.0.5
   commands:
   - docker build -t kine:test-${DRONE_COMMIT} -f Dockerfile.test .
   environment:
@@ -82,7 +83,7 @@ steps:
     - pull_request
 
 - name: test-sqlite
-  image: rancher/dapper:v0.6.0
+  image: docker:25.0.5
   depends_on:
    - build
    - test-image
@@ -99,7 +100,7 @@ steps:
     - pull_request
 
 - name: test-mysql
-  image: rancher/dapper:v0.6.0
+  image: docker:25.0.5
   depends_on:
    - build
    - test-image
@@ -116,7 +117,7 @@ steps:
     - pull_request
 
 - name: test-postgres
-  image: rancher/dapper:v0.6.0
+  image: docker:25.0.5
   depends_on:
    - build
    - test-image
@@ -133,7 +134,7 @@ steps:
     - pull_request
 
 - name: test-cockroachdb
-  image: rancher/dapper:v0.6.0
+  image: docker:25.0.5
   depends_on:
    - build
    - test-image
@@ -150,7 +151,7 @@ steps:
     - pull_request
 
 - name: test-schema-migration
-  image: rancher/dapper:v0.6.0
+  image: docker:25.0.5
   depends_on:
    - build
    - test-image
@@ -167,7 +168,7 @@ steps:
     - pull_request
 
 - name: test-nats
-  image: rancher/dapper:v0.6.0
+  image: docker:25.0.5
   depends_on:
    - build
    - test-image
@@ -207,7 +208,7 @@ platform:
 
 steps:
 - name: build
-  image: rancher/dapper:v0.6.0
+  image: docker:25.0.5
   commands:
   - apk add make git bash file
   - make
@@ -282,7 +283,7 @@ platform:
 
 steps:
 - name: build
-  image: rancher/dapper:v0.5.0 # Fixed to v0.5.0 as newer versions of dapper don't work on arm
+  image: docker:25.0.5
   commands:
   - apk add make git bash file
   - make