diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 480fff9c..806dd29d 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -155,7 +155,17 @@ jobs:
           SANITIZED=$(echo "${BRANCH_NAME}" | \
             tr '[:upper:]' '[:lower:]' | \
             tr '/' '-' | \
-          sed 's/[^a-z0-9._-]/-/g' | \
+            sed 's/[^a-z0-9._-]/-/g' | \
+            sed 's/^-//; s/-$//' | \
+            sed 's/--*/-/g' | \
+            cut -c1-121)
+
+          FEATURE_TAG="${SANITIZED}-${SHORT_SHA}"
+          echo "tag=${FEATURE_TAG}" >> $GITHUB_OUTPUT
+          echo "📦 Computed feature branch tag: ${FEATURE_TAG}"
+
+      - name: Generate Docker metadata
+        id: meta
         uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
         with:
           images: |