diff --git a/.drone.yml b/.drone.yml
index 8285c41..fd24515 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,14 +6,11 @@ services:
   - name: docker
     image: docker:dind
     privileged: true
-    volumes:
-      - name: dockersock
-        path: /var/run
 
 trigger:
   branch:
     - main
-    - ci-build-container  # TODO: Remove after testing
+    - ci-build-container # TODO: Remove after testing
   event:
     - push
     - tag
@@ -21,10 +18,8 @@ trigger:
 steps:
   - name: build-and-publish-container
     image: docker:cli
-    volumes:
-      - name: dockersock
-        path: /var/run
     environment:
+      DOCKER_HOST: tcp://docker:2375 # Connect to dind service
       REGISTRY: git.local-it.org/ci-builder
       IMAGE_NAME: mitgliederverwaltung
       REGISTRY_USERNAME:
@@ -32,7 +27,8 @@ steps:
       REGISTRY_TOKEN:
         from_secret: DRONE_REGISTRY_TOKEN
     commands:
-      - sleep 6 # give docker time to start
+      - sleep 5 # give docker time to start
+      - docker info # verify docker is ready
       # Build image once
       - docker build --tag $REGISTRY/$IMAGE_NAME:build-$DRONE_BUILD_NUMBER .
       # Login to registry
@@ -56,9 +52,8 @@ steps:
           docker push $REGISTRY/$IMAGE_NAME:latest
         fi
 
-volumes:
-  - name: dockersock
-    temp: {}
+
+# No volumes needed - docker:cli connects to dind service via TCP
 
 ---
 kind: pipeline