diff --git a/.drone.jsonnet b/.drone.jsonnet
index b32f3f7..f63ff0d 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -19,7 +19,7 @@ local add_build_steps() = [
     volumes: [
       {
         name: 'dockersock',
-        path: '/var/run/docker.sock',
+        path: '/var/run',
       },
     ],
     commands: [
@@ -29,7 +29,7 @@ local add_build_steps() = [
       'rm -rf target/' + arch.target + '/release/*',
     ],
     environment: {
-      CROSS_DOCKER_IN_DOCKER: true,
+      CROSS_REMOTE: true,
     },
     depends_on: ['Wait for Docker'],
   }
@@ -57,11 +57,11 @@ local add_build_steps() = [
         'docker pull hello-world:latest',
       ],
       environment: {
-        CROSS_DOCKER_IN_DOCKER: true,
+        CROSS_REMOTE: true,
       },
       volumes: [{
         name: 'dockersock',
-        path: '/var/run/docker.sock',
+        path: '/var/run',
       }],
     }] +
     add_build_steps() +
@@ -92,12 +92,26 @@ local add_build_steps() = [
       },
     ],
 
+  services: [{
+    name: 'docker',
+    image: 'docker:dind',
+    privileged: true,
+    volumes: [
+      {
+        name: 'dockersock',
+        path: '/var/run',
+      },
+      {
+        name: 'docker-storage',
+        path: '/var/lib/docker',
+      },
+    ],
+  }],
+
   volumes: [
     {
       name: 'dockersock',
-      host: {
-        path: '/var/run/docker.sock',
-      },
+      temp: {},
     },
   ],