diff --git a/.drone.jsonnet b/.drone.jsonnet
index 283965e..68298bf 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -31,7 +31,7 @@ local add_build_steps() = [
       'rm -rf target/' + arch.target + '/release/*',
     ],
     environment: {
-      CROSS_REMOTE: true,
+      CROSS_DOCKER_IN_DOCKER: true,
     },
     depends_on: ['Wait for Docker'],
   }
@@ -55,10 +55,14 @@ local add_build_steps() = [
         'while ! docker image ls; do sleep 1; done',
         'docker info',
         'docker pull hello-world:latest',
+        'docker run --rm hello-world:latest',
       ],
+      environment: {
+        CROSS_DOCKER_IN_DOCKER: true,
+      },
       volumes: [{
         name: 'dockersock',
-        path: '/var/run',
+        path: '/var/run/docker.sock',
       }],
     }] +
     add_build_steps() +
@@ -89,32 +93,11 @@ local add_build_steps() = [
       },
     ],
 
-  services: [{
-    name: 'docker',
-    image: 'docker:dind',
-    pull: true,
-    privileged: true,
-    volumes: [
-      {
-        name: 'dockersock',
-        path: '/var/run',
-      },
-      {
-        name: 'docker-storage',
-        path: '/var/lib/docker',
-      },
-    ],
-  }],
-
   volumes: [
     {
       name: 'dockersock',
-      temp: {},
-    },
-    {
-      name: 'docker-storage',
       host: {
-        path: '/srv/drone/docker-dind-rust',
+        path: '/var/run/docker.sock',
       },
     },
   ],