diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index b48d2db..6bfd3dd 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -1,4 +1,3 @@
-
 steps:
   build-frontend:
     name: Build & Push Frontend
@@ -7,6 +6,8 @@ steps:
       event: [ push, pull_request, tag, manual ]
       path:
         include: [ frontend/** ]
+    environment:
+      IMAGE_TAG: ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
     settings:
       registry: harbor.dvirlabs.com
       repo: my-apps/labmap-frontend
@@ -27,6 +28,8 @@ steps:
       event: [ push, pull_request, tag, manual ]
       path:
         include: [ backend/** ]
+    environment:
+      IMAGE_TAG: ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
     settings:
       registry: harbor.dvirlabs.com
       repo: my-apps/labmap-backend
@@ -45,6 +48,12 @@ steps:
     image: alpine:3.19
     when:
       event: [ push ]
+    environment:
+      GIT_USERNAME:
+        from_secret: GIT_USERNAME
+      GIT_TOKEN:
+        from_secret: GIT_TOKEN
+      IMAGE_TAG: ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
     commands:
       - apk add --no-cache git curl yq
       - git config --global user.name "Woodpecker Bot"
@@ -53,11 +62,5 @@ steps:
       - cd my-apps/manifests/labmap
       - yq -i ".image.tag = \"${IMAGE_TAG}\"" values.yaml
       - git add values.yaml
-      - git commit -m "Update labmap image tag to ${IMAGE_TAG}"
+      - git commit -m "Update labmap image tag to ${IMAGE_TAG}" || echo "Nothing to commit"
       - git push origin master
-    environment:
-      GIT_USERNAME:
-        from_secret: GIT_USERNAME
-      GIT_TOKEN:
-        from_secret: GIT_TOKEN
-      IMAGE_TAG: ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}