diff --git a/.drone.yml b/.drone.yml
index 6315c91..1bbe67c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -48,7 +48,7 @@ steps:
   image: plugins/docker
   settings:
     repo: kleph/beer
-    tags: latest
+    tags: ${DRONE_COMMIT_SHA:0:8}
     username:
       from_secret: dockerhub_username
     password:
@@ -71,11 +71,16 @@ steps:
       from_secret: kubectl_cert
     kubernetes_token:
       from_secret: kubectl_token
+  environment:
+    IMAGE_TAG: ${DRONE_COMMIT_SHA:0:8}
   commands:
+  - echo "== pre deploy status:"
   - kubectl get pods --namespace=beer
   - kubectl get deployments --namespace=beer
   - kubectl get svc --namespace=beer
-  - kubectl apply -f kube/beer-deployment.yaml --namespace=beer
+  - cat kube/beer-deployment.yaml > kube/beer-deployment-${IMAGE_TAG}.yaml
+  - kubectl apply -f kube/beer-deployment-${IMAGE_TAG}.yaml --namespace=beer
+  - echo "== post deploy status:"
 
 depends_on:
 - build
diff --git a/kube/beer-deployment.yaml b/kube/beer-deployment.yaml
index bf08ebb..83e916d 100644
--- a/kube/beer-deployment.yaml
+++ b/kube/beer-deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: beer
-        image: kleph/beer
+        image: kleph/beer:${IMAGE_TAG}
         imagePullPolicy: Always
         ports:
         - containerPort: 5000