diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 57c0e81..6726aa5 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -1,8 +1,8 @@
 steps:
   generate-tags-frontend:
-    name: Generate Tags for Frontend
     image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
     when:
+      event: [ push ]
       path:
         include: [ frontend/** ]
     settings:
@@ -13,7 +13,6 @@ steps:
       tags_file: .tags-frontend
 
   build-frontend:
-    name: Build & Push Frontend
     image: woodpeckerci/plugin-kaniko
     depends_on: [ generate-tags-frontend ]
     when:
@@ -32,9 +31,9 @@ steps:
         from_secret: DOCKER_PASSWORD
 
   generate-tags-backend:
-    name: Generate Tags for Backend
     image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
     when:
+      event: [ push ]
       path:
         include: [ backend/** ]
     settings:
@@ -45,7 +44,6 @@ steps:
       tags_file: .tags-backend
 
   build-backend:
-    name: Build & Push Backend
     image: woodpeckerci/plugin-kaniko
     depends_on: [ generate-tags-backend ]
     when:
@@ -64,7 +62,6 @@ steps:
         from_secret: DOCKER_PASSWORD
 
   update-values-frontend:
-    name: Update frontend tag in values.yaml
     image: alpine:3.19
     when:
       event: [ push ]
@@ -79,7 +76,7 @@ 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
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
@@ -94,7 +91,6 @@ steps:
         git push origin HEAD
 
   update-values-backend:
-    name: Update backend tag in values.yaml
     image: alpine:3.19
     when:
       event: [ push ]
@@ -109,7 +105,7 @@ 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
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then