diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index e0d7d2d..128d99a 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -14,10 +14,12 @@ steps:
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
+        - ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
       username:
         from_secret: DOCKER_USERNAME
       password:
         from_secret: DOCKER_PASSWORD
+    
 
   build-backend:
     name: Build & Push Backend
@@ -34,6 +36,7 @@ steps:
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
+        - ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
       username:
         from_secret: DOCKER_USERNAME
       password:
@@ -57,10 +60,17 @@ steps:
       - git config --global user.email "ci@dvirlabs.com"
       - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
-      - yq -i '.frontend.tag = "${CI_COMMIT_SHA:0:7}"' manifests/labmap/values.yaml
-      - git add manifests/labmap/values.yaml
-      - "git commit -m 'frontend: update tag to ${CI_COMMIT_SHA:0:7}' || echo 'No changes'"
-      - git push origin master
+      - |
+        if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
+          TAG="develop-${CI_BUILD_NUMBER}"
+        else
+          TAG="${CI_COMMIT_SHA:0:7}"
+        fi
+        echo "💡 Setting frontend tag to: $TAG"
+        yq -i ".frontend.tag = \"$TAG\"" manifests/labmap/values.yaml
+        git add manifests/labmap/values.yaml
+        git commit -m "frontend: update tag to $TAG" || echo "No changes"
+        git push origin master
 
   update-values-backend:
     name: Update backend tag in values.yaml
@@ -78,9 +88,16 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      # - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
-      - yq -i '.backend.tag = "${CI_COMMIT_SHA:0:7}"' manifests/labmap/values.yaml
-      - git add manifests/labmap/values.yaml
-      - "git commit -m 'backend: update tag to ${CI_COMMIT_SHA:0:7}' || echo 'No changes'"
-      - git push origin master
+      - |
+        if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
+          TAG="develop-${CI_BUILD_NUMBER}"
+        else
+          TAG="${CI_COMMIT_SHA:0:7}"
+        fi
+        echo "💡 Setting backend tag to: $TAG"
+        yq -i ".backend.tag = \"$TAG\"" manifests/labmap/values.yaml
+        git add manifests/labmap/values.yaml
+        git commit -m "backend: update tag to $TAG" || echo "No changes"
+        git push origin master