diff --git a/.drone.yml b/.drone.yml
index bddc38a..2b95539 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,18 +8,15 @@ trigger:
 steps:
 
   - name: build-and-push
-    image: docker:cli
-    environment:
-      REGISTRY: registry.binderlab.io
-      IMAGE_NAME: registry.binderlab.io/harbormaster
-      DOCKER_USERNAME: 
+    image: plugins/docker
+    settings:
+      username:
         from_secret: DOCKER_USERNAME
-      DOCKER_PASSWORD: 
+      password:
         from_secret: DOCKER_PASSWORD
-    commands:
-      - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin $REGISTRY
-      - docker build -t $IMAGE_NAME:latest .
-      - docker push $IMAGE_NAME:latest
+      repo: registry.binderlab.io/harbormaster
+      registry: registry.binderlab.io
+      tags: latest
 
   - name: deploy
     image: alpine