diff --git a/.drone.yml b/.drone.yml
index 2f9088709bf2d7d9351aaecf81283215e670572e..b51a5c1cf090e53c554ed9a00634a45de319f4de 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -29,8 +29,8 @@ steps:
 - name: login-to-docker
   image: docker:dind
   volumes:
-  - name: dockersock
-    path: /var/run
+  - name: dockerconfig
+    path: /root/.docker
   environment:
     DOCKER_PASSWORD:
       from_secret: DOCKER_PASSWORD
@@ -39,14 +39,27 @@ steps:
       - cat .env
       - echo $DOCKER_PASSWORD | docker login --username $DRONE_REPO_OWNER --password-stdin $registry_domain
 
+- name: wait-for-docker
+  image: docker:dind
+  volumes:
+  - name: dockersock
+    path: /var/run
+  commands:
+      - |
+        while [ ! -S /var/run/docker.sock ]; do
+          echo "Waiting for docker socket..."
+          sleep 1
+        done'
+
 - name: Build-docker
   image: docker:dind
   volumes:
   - name: dockersock
     path: /var/run
+  - name: dockerconfig
+    path: /root/.docker
   commands:
       - source .env
-      - sleep 5 # wait for docker to start
       - docker ps -a
       - docker context create build
       - docker buildx create build --use
@@ -62,4 +75,6 @@ services:
 
 volumes:
 - name: dockersock
+  temp: {}
+- name: dockerconfig
   temp: {}
\ No newline at end of file