diff --git a/.drone.yml b/.drone.yml
index 81e39a9..ab54069 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,15 +3,11 @@ name: build-smart-commit
 
 steps:
 - name: "build-and-push"
-  image: yobasystems/alpine-docker
-  commands:
-  - docker build -t code.ndumas.com/ndumas/smart-commit:latest .
-  - docker push code.ndumas.com/ndumas/smart-commit:latest
-  volumes:
-  - name: docksock
-    path: /var/run/docker.sock
-
-volumes:
-- name: docksock
-  host:
-    path: /var/run/docker.sock
+  image: plugins/docker
+  settings:
+    repo: code.ndumas.com/ndumas/smart-commit
+    tags: latest
+    username:
+      from_secret: docker_username
+    passsword:
+      from_secret: docker_password