diff --git a/.drone.yml b/.drone.yml
index 6027a87..721a0fe 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,19 +12,13 @@ steps:
       - npm run build
 
   - name: docker-build
-    image: docker
-    volumes:
-      - source: /var/run/docker.sock
-        target: /var/run/docker.sock
-    privileged: true
-    commands:
-      - docker build -t code.anufrij.de/webplay/client:latest ./docker
-
-  - name: docker-test
-    image: docker
-    commands:
-      - docker run code.anufrij.de/webplay/client:latest npm test
-
-  - name: docker-publish
-    image: docker
-
+    image: plugins/docker
+    dockerfile: ./docker/Dockerfile
+    pull: never
+    settings:
+      repo: code.anufrij.de/webplay/client
+      tags: latest
+      username:
+        from_secret: username
+      password:
+        from_secret: password