diff --git a/.drone.yml b/.drone.yml
index 5fa28e7..b658c06 100755
--- a/.drone.yml
+++ b/.drone.yml
@@ -21,45 +21,62 @@ steps:
 #   volumes:
 #   - name: docker_sock
 #     path: /var/run/docker.sock
-- name: build
-  image: docker
-  environment:
-    SMTP_PROXY_EMAIL:
-      from_secret: SMTP_PROXY_EMAIL
-    SMTP_RECIPIENT_EMAIL:
-      from_secret: SMTP_RECIPIENT_EMAIL
-    SMTP_HOST:
-      from_secret: SMTP_HOST
-    SMTP_PORT:
-      from_secret: SMTP_PORT
-    SMTP_USERNAME:
-      from_secret: SMTP_USERNAME
-    SMTP_PASSWORD:
-      from_secret: SMTP_PASSWORD
-    NEXT_PUBLIC_GOOGLE_APPOINTMENTS_LINK:
-      from_secret: NEXT_PUBLIC_GOOGLE_APPOINTMENTS_LINK
-    RECAPTCHA_SECRET_KEY:
-      from_secret: RECAPTCHA_SECRET_KEY
-    NEXT_PUBLIC_RECAPTCHA_SITE_KEY:
-      from_secret: NEXT_PUBLIC_RECAPTCHA_SITE_KEY
-    REGISTRY_USER:
-      from_secret: DOCKER_USERNAME
-    REGISTRY_PASS:
-      from_secret: DOCKER_PASSWORD
-  volumes:
-  - name: docker_sock
-    path: /var/run/docker.sock
-  commands:
-  - export DRONE_SHA=${DRONE_COMMIT_SHA:0:7}
-  - docker login gitea.bsidesolutions.net --username $REGISTRY_USER --password $REGISTRY_PASS
-  # - docker exec --env-file .env.drone compose-container mkdir /home/node
-  # - docker exec --env-file .env.drone compose-container mkdir /home/node/app
-  # - docker cp . compose-container:/home/node/app
-  # - docker exec -w /home/node/app --env-file .env.drone compose-container ls # check current directory
-  - docker build -t gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7} . --no-cache
+# - name: build
+#   image: docker
+#   environment:
+#     SMTP_PROXY_EMAIL:
+#       from_secret: SMTP_PROXY_EMAIL
+#     SMTP_RECIPIENT_EMAIL:
+#       from_secret: SMTP_RECIPIENT_EMAIL
+#     SMTP_HOST:
+#       from_secret: SMTP_HOST
+#     SMTP_PORT:
+#       from_secret: SMTP_PORT
+#     SMTP_USERNAME:
+#       from_secret: SMTP_USERNAME
+#     SMTP_PASSWORD:
+#       from_secret: SMTP_PASSWORD
+#     NEXT_PUBLIC_GOOGLE_APPOINTMENTS_LINK:
+#       from_secret: NEXT_PUBLIC_GOOGLE_APPOINTMENTS_LINK
+#     RECAPTCHA_SECRET_KEY:
+#       from_secret: RECAPTCHA_SECRET_KEY
+#     NEXT_PUBLIC_RECAPTCHA_SITE_KEY:
+#       from_secret: NEXT_PUBLIC_RECAPTCHA_SITE_KEY
+#     REGISTRY_USER:
+#       from_secret: DOCKER_USERNAME
+#     REGISTRY_PASS:
+#       from_secret: DOCKER_PASSWORD
+#   volumes:
+#   - name: docker_sock
+#     path: /var/run/docker.sock
+#   commands:
+#   - export DRONE_SHA=${DRONE_COMMIT_SHA:0:7}
+#   - docker login gitea.bsidesolutions.net --username $REGISTRY_USER --password $REGISTRY_PASS
+#   # - docker exec --env-file .env.drone compose-container mkdir /home/node
+#   # - docker exec --env-file .env.drone compose-container mkdir /home/node/app
+#   # - docker cp . compose-container:/home/node/app
+#   # - docker exec -w /home/node/app --env-file .env.drone compose-container ls # check current directory
+#   - docker build -t gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7} .
   
-  - docker tag gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7}
-  - docker tag gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:latest
+#   - docker tag gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7}
+#   - docker tag gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:latest
+
+- name: docker-build  
+  image: plugins/docker
+  settings:
+    username:
+      from_secret: DOCKER_USERNAME
+    password:
+      from_secret: DOCKER_PASSWORD
+    repo: gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio
+    registry: gitea.bsidesolutions.net
+    dockerfile: ./Dockerfile
+    force_tag: true
+    tags:
+    - latest
+    - ${DRONE_COMMIT_SHA:0:7}
+
+
 - name: push-image
   image: docker
   environment: