diff --git a/.drone.yml b/.drone.yml
index 0cc16b9..5674a5a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -29,22 +29,16 @@ steps:
           --target base \
           --context /drone/src \
           --dockerfile Dockerfile \
-          --destination "$${DESTINATION_PREFIX}:base-$${DRONE_TAG:-$DRONE_COMMIT_BRANCH}"
+          --destination "$DESTINATION_PREFIX:base-$DRONE_COMMIT_SHA"
     - >
       /kaniko/executor \
           --cache=true \
           --target linters \
           --context /drone/src \
           --dockerfile Dockerfile \
-          --destination "$${DESTINATION_PREFIX}:linters-$${DRONE_TAG:-$DRONE_COMMIT_BRANCH}"
-  when:
-    ref:
-      - refs/heads/main
-      - refs/heads/ci
-      - refs/tags/v*
-
+          --destination "$DESTINATION_PREFIX:linters-$DRONE_COMMIT_SHA"
 
 - name: lint
-  image: "$${DESTINATION_PREFIX}:linters-$${DRONE_TAG:-$DRONE_COMMIT_BRANCH}"
+  image: "$DESTINATION_PREFIX:linters-$DRONE_COMMIT_SHA"
   commands:
     - pre-commit run --all-files --color always