diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 4551ece..8df1d8b 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -9,7 +9,7 @@ steps:
         include: [ frontend/** ]
     settings:
       registry: harbor.dvirlabs.com
-      repo: my-apps/labmap-frontend
+      repo: my-apps/${CI_REPO_NAME}-frontend
       dockerfile: frontend/Dockerfile
       context: frontend
       tags:
@@ -30,7 +30,7 @@ steps:
         include: [ backend/** ]
     settings:
       registry: harbor.dvirlabs.com
-      repo: my-apps/labmap-backend
+      repo: my-apps/${CI_REPO_NAME}-backend
       dockerfile: backend/Dockerfile
       context: backend
       tags:
@@ -63,8 +63,8 @@ steps:
       - |
         TAG="${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}"
         echo "💡 Setting frontend tag to: $TAG"
-        yq -i ".frontend.tag = \"$TAG\"" manifests/labmap/values.yaml
-        git add manifests/labmap/values.yaml
+        yq -i ".frontend.tag = \"$TAG\"" manifests/${CI_REPO_NAME}/values.yaml
+        git add manifests/${CI_REPO_NAME}/values.yaml
         git commit -m "frontend: update tag to $TAG" || echo "No changes"
         git push origin HEAD
 
@@ -85,11 +85,12 @@ 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"
       - cd my-apps
       - |
         TAG="${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}"
         echo "💡 Setting backend tag to: $TAG"
-        yq -i ".backend.tag = \"$TAG\"" manifests/labmap/values.yaml
-        git add manifests/labmap/values.yaml
+        yq -i ".backend.tag = \"$TAG\"" manifests/${CI_REPO_NAME}/values.yaml
+        git add manifests/${CI_REPO_NAME}/values.yaml
         git commit -m "backend: update tag to $TAG" || echo "No changes"
         git push origin HEAD
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 9f5a53f..62c649d 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -27,3 +27,4 @@ RUN dos2unix /docker-entrypoint.d/10-generate-env.sh && chmod +x /docker-entrypo
 
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]
+