diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 9115655..57c0e81 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -1,9 +1,23 @@
 steps:
+  generate-tags-frontend:
+    name: Generate Tags for Frontend
+    image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
+    when:
+      path:
+        include: [ frontend/** ]
+    settings:
+      tags: |
+        edge -b develop -v develop
+        edge -b master -v latest
+        sha
+      tags_file: .tags-frontend
+
   build-frontend:
     name: Build & Push Frontend
     image: woodpeckerci/plugin-kaniko
+    depends_on: [ generate-tags-frontend ]
     when:
-      event: [ push, pull_request, tag ]
+      event: [ push ]
       path:
         include: [ frontend/** ]
     settings:
@@ -11,21 +25,31 @@ steps:
       repo: my-apps/labmap-frontend
       dockerfile: frontend/Dockerfile
       context: frontend
-      tags:
-        - latest
-        - ${CI_COMMIT_SHA:0:7}
-        - ${CI_COMMIT_BRANCH=="develop" && echo "develop-${CI_COMMIT_SHA}" || echo "${CI_COMMIT_SHA:0:7}"}
+      tags_file: .tags-frontend
       username:
         from_secret: DOCKER_USERNAME
       password:
         from_secret: DOCKER_PASSWORD
-    
+
+  generate-tags-backend:
+    name: Generate Tags for Backend
+    image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
+    when:
+      path:
+        include: [ backend/** ]
+    settings:
+      tags: |
+        edge -b develop -v develop
+        edge -b master -v latest
+        sha
+      tags_file: .tags-backend
 
   build-backend:
     name: Build & Push Backend
     image: woodpeckerci/plugin-kaniko
+    depends_on: [ generate-tags-backend ]
     when:
-      event: [ push, pull_request, tag ]
+      event: [ push ]
       path:
         include: [ backend/** ]
     settings:
@@ -33,10 +57,7 @@ steps:
       repo: my-apps/labmap-backend
       dockerfile: backend/Dockerfile
       context: backend
-      tags:
-        - latest
-        - ${CI_COMMIT_SHA:0:7}
-        - ${CI_COMMIT_BRANCH=="develop" && echo "develop-${CI_COMMIT_SHA}" || echo "${CI_COMMIT_SHA:0:7}"}
+      tags_file: .tags-backend
       username:
         from_secret: DOCKER_USERNAME
       password:
@@ -70,7 +91,7 @@ steps:
         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
+        git push origin HEAD
 
   update-values-backend:
     name: Update backend tag in values.yaml
@@ -100,4 +121,4 @@ steps:
         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
+        git push origin HEAD
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)