diff --git a/.drone.yml b/.drone.yml
index c5be4e8..92626ff 100755
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,6 +28,7 @@ steps:
   - name: docker_sock
     path: /var/run/docker.sock
   commands:
+  - export DRONE_SHA=${DRONE_COMMIT_SHA:0:7}
   - docker-compose -f ./docker-compose.drone.yaml build
   - docker tag oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7} gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7}
 - name: push-image
@@ -59,6 +60,7 @@ steps:
   - 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-compose -f ./docker-compose.drone.yaml push
 
diff --git a/docker-compose.drone.yaml b/docker-compose.drone.yaml
index 91496bb..3d2cea4 100755
--- a/docker-compose.drone.yaml
+++ b/docker-compose.drone.yaml
@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   oonyeje-portfolio:
-    image: gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:${DRONE_COMMIT_SHA:0:7}
+    image: gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:${DRONE_SHA:-latest}
     build:
       context: ./
       dockerfile: Dockerfile