diff --git a/.drone.yml b/.drone.yml
index a94165d..7004e06 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,16 +15,10 @@ steps:
     commands:
       - |
         set -e
-        case "$DRONE_BRANCH" in
-          main) echo prod;;
-          uat)  echo uat;;
-          dev)  echo dev;;
-          *)    echo dev;;
-        esac > .environment
-      - echo "Branch ${DRONE_BRANCH}, Environment $(cat .environment)"
-      - APP_VERSION=$(cat .environment)-${DRONE_BUILD_NUMBER}
-      - echo "APP Version tag $APP_VERSION"
-      - echo -n "$APP_VERSION" >> .tags
+        SHORT_SHA=$(echo "$DRONE_COMMIT_SHA" | cut -c1-8)
+        IMG_TAG="${DRONE_BUILD_NUMBER}-${DRONE_BRANCH}"
+        echo -n "$IMG_TAG,$SHORT_SHA" > .tags
+        echo "Image tags -> $IMG_TAG , $SHORT_SHA"
       - mkdir -p ./artifacts/go/bin ./artifacts/go/config
       - go env
       - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -o ./artifacts/go/bin/web ./cmd/web/main.go