diff --git a/.drone.yml b/.drone.yml
index 216a63102..ec1fac703 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,12 +9,21 @@ trigger:
   event:
     - push
 
-steps:
-  - name: docker-login
+services:
+  docker:
     image: docker:20.10.16-dind
     privileged: true
+    environment:
+      # Disable TLS to simplify connection (not recommended for production)
+      DOCKER_TLS_CERTDIR: ""
+
+steps:
+  - name: docker-login
+    image: docker:20.10.16
     environment:
       DOCKER_BUILDKIT: 1
+      # Point to the Docker service
+      DOCKER_HOST: tcp://docker:2375
       DOCKER_USERNAME:
         from_secret: docker_username
       DOCKER_PASSWORD:
@@ -23,26 +32,26 @@ steps:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
   - name: create-builder
-    image: docker:20.10.16-dind
-    privileged: true
+    image: docker:20.10.16
     environment:
       DOCKER_BUILDKIT: 1
+      DOCKER_HOST: tcp://docker:2375
     commands:
       - docker buildx create --use --name multi-builder || docker buildx use multi-builder
 
   - name: bootstrap
-    image: docker:20.10.16-dind
-    privileged: true
+    image: docker:20.10.16
     environment:
       DOCKER_BUILDKIT: 1
+      DOCKER_HOST: tcp://docker:2375
     commands:
       - docker buildx inspect --bootstrap
 
   - name: build-push
-    image: docker:20.10.16-dind
-    privileged: true
+    image: docker:20.10.16
     environment:
       DOCKER_BUILDKIT: 1
+      DOCKER_HOST: tcp://docker:2375
       DOCKER_USERNAME:
         from_secret: docker_username
     commands: