diff --git a/.drone.yml b/.drone.yml
index eec07f4..03398a8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,20 +28,16 @@ steps:
         from_secret: docker_password
     commands:
       - echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
-      - docker info | grep "Registry"
 
   - name: docker build and push
-    image: plugins/docker
-    settings:
-      repo: khwezi/webapitest
-      registry: index.docker.io      
-      username:
+    image: docker:20.10
+    environment:
+      DOCKER_USERNAME:
         from_secret: docker_username
-      password: 
+      DOCKER_PASSWORD:
         from_secret: docker_password
-      dockerfile: Dockerfile
-      context: .
-      force_tag: true
-      tags:
-        - latest
-        - ${DRONE_BUILD_NUMBER}
\ No newline at end of file
+    commands:
+      - echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
+      - docker build -t khwezi/webapitest:latest -t khwezi/webapitest:${DRONE_BUILD_NUMBER} .
+      - docker push khwezi/webapitest:latest
+      - docker push khwezi/webapitest:${DRONE_BUILD_NUMBER}
\ No newline at end of file