diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index e0d7d2d..84e1c55 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -14,6 +14,7 @@ steps:
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
+        - develop-${CI_BUILD_NUMBER}
       username:
         from_secret: DOCKER_USERNAME
       password:
@@ -34,6 +35,7 @@ steps:
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
+        - develop-${CI_BUILD_NUMBER}
       username:
         from_secret: DOCKER_USERNAME
       password:
@@ -55,12 +57,14 @@ 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 '.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
+      - |
+        TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")
+        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 +82,11 @@ 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
+      - |
+        TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")
+        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
diff --git a/backend/main.py b/backend/main.py
index 21d4717..0f6b923 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,5 +81,6 @@ def list_icons():
     return categories
 
 
+
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)