diff --git a/.woodpecker/build-frontend.yaml b/.woodpecker/build-frontend.yaml
index 11e71eb..062e9f8 100644
--- a/.woodpecker/build-frontend.yaml
+++ b/.woodpecker/build-frontend.yaml
@@ -6,8 +6,18 @@ steps:
   prepare-fe-image-tags:
     image: alpine:3.21
     commands:
-      - SHORT_SHA="$(echo "$CI_COMMIT_SHA" | cut -c1-8)"
-      - printf '%s\n' "$SHORT_SHA" > .fe-tags
+      - |
+        COMMIT_SHA="${CI_COMMIT_SHA:-${CI_COMMIT:-${DRONE_COMMIT_SHA:-${DRONE_COMMIT:-}}}}"
+        if [ -n "$COMMIT_SHA" ]; then
+          IMAGE_TAG="$(printf '%s' "$COMMIT_SHA" | cut -c1-8)"
+        else
+          REF_NAME="${CI_COMMIT_REF:-${CI_COMMIT_BRANCH:-manual}}"
+          REF_NAME="${REF_NAME#refs/heads/}"
+          REF_NAME="$(printf '%s' "$REF_NAME" | sed 's#[^A-Za-z0-9_.-]#-#g')"
+          IMAGE_TAG="$(printf '%s' "${REF_NAME:-manual}-${CI_PIPELINE_NUMBER:-0}" | cut -c1-32)"
+        fi
+        echo "Using frontend image tag: $IMAGE_TAG"
+        printf '%s\n' "$IMAGE_TAG" > .fe-tags
       - printf '%s\n' "latest" >> .fe-tags
 
   build-and-push-fe-image:
diff --git a/.woodpecker/e2e.yaml b/.woodpecker/e2e.yaml
index 66172cd..f5f3fdd 100644
--- a/.woodpecker/e2e.yaml
+++ b/.woodpecker/e2e.yaml
@@ -6,8 +6,18 @@ steps:
   prepare-e2e-image-tags:
     image: alpine:3.21
     commands:
-      - SHORT_SHA="$(echo "$CI_COMMIT_SHA" | cut -c1-8)"
-      - printf '%s\n' "$SHORT_SHA" > .e2e-tags
+      - |
+        COMMIT_SHA="${CI_COMMIT_SHA:-${CI_COMMIT:-${DRONE_COMMIT_SHA:-${DRONE_COMMIT:-}}}}"
+        if [ -n "$COMMIT_SHA" ]; then
+          IMAGE_TAG="$(printf '%s' "$COMMIT_SHA" | cut -c1-8)"
+        else
+          REF_NAME="${CI_COMMIT_REF:-${CI_COMMIT_BRANCH:-manual}}"
+          REF_NAME="${REF_NAME#refs/heads/}"
+          REF_NAME="$(printf '%s' "$REF_NAME" | sed 's#[^A-Za-z0-9_.-]#-#g')"
+          IMAGE_TAG="$(printf '%s' "${REF_NAME:-manual}-${CI_PIPELINE_NUMBER:-0}" | cut -c1-32)"
+        fi
+        echo "Using e2e image tag: $IMAGE_TAG"
+        printf '%s\n' "$IMAGE_TAG" > .e2e-tags
       - printf '%s\n' "latest" >> .e2e-tags
 
   build-and-push-e2e-image:
@@ -37,9 +47,19 @@ steps:
       GITEA_PACKAGES_TOKEN:
         from_secret: gitea_packages_token
     commands:
-      - SHORT_SHA="$(echo "$CI_COMMIT_SHA" | cut -c1-8)"
-      - export FRONTEND_IMAGE="git.cluster.lab.kemkas.hu/${CI_REPO}:${SHORT_SHA}"
-      - export E2E_IMAGE="git.cluster.lab.kemkas.hu/${CI_REPO}-e2e:${SHORT_SHA}"
+      - |
+        COMMIT_SHA="${CI_COMMIT_SHA:-${CI_COMMIT:-${DRONE_COMMIT_SHA:-${DRONE_COMMIT:-}}}}"
+        if [ -n "$COMMIT_SHA" ]; then
+          IMAGE_TAG="$(printf '%s' "$COMMIT_SHA" | cut -c1-8)"
+        else
+          REF_NAME="${CI_COMMIT_REF:-${CI_COMMIT_BRANCH:-manual}}"
+          REF_NAME="${REF_NAME#refs/heads/}"
+          REF_NAME="$(printf '%s' "$REF_NAME" | sed 's#[^A-Za-z0-9_.-]#-#g')"
+          IMAGE_TAG="$(printf '%s' "${REF_NAME:-manual}-${CI_PIPELINE_NUMBER:-0}" | cut -c1-32)"
+        fi
+        export FRONTEND_IMAGE="git.cluster.lab.kemkas.hu/${CI_REPO}:${IMAGE_TAG}"
+        export E2E_IMAGE="git.cluster.lab.kemkas.hu/${CI_REPO}-e2e:${IMAGE_TAG}"
+        echo "Using image tag: $IMAGE_TAG"
       - docker login git.cluster.lab.kemkas.hu -u "$GITEA_PACKAGES_USERNAME" -p "$GITEA_PACKAGES_TOKEN"
       - |
         for i in $(seq 1 30); do