diff --git a/.github/workflows/apply_changes_on_cluster.yml b/.github/workflows/apply_changes_on_cluster.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/.github/workflows/build_and_push_auth_docker_img.yml b/.github/workflows/build_and_push_auth_docker_img.yml
index fa8e68b..86b6e8c 100644
--- a/.github/workflows/build_and_push_auth_docker_img.yml
+++ b/.github/workflows/build_and_push_auth_docker_img.yml
@@ -2,8 +2,8 @@ name: Build and Push Backend image to Docker Hub
 
 on:
     push:
-        branches:
-            - 'main'
+#        branches:
+#            - 'main'
         paths:
             - '- "auth-service/**"'
 
@@ -24,5 +24,5 @@ jobs:
           uses: docker/build-push-action@v5
           with:
             push: true
-            context: backend
+            context: auth-service
             tags: vcscsvcscs/gheritage-auth-service:latest
\ No newline at end of file
diff --git a/.github/workflows/build_and_push_backend_docker_img.yml b/.github/workflows/build_and_push_backend_docker_img.yml
index b93487d..998f866 100644
--- a/.github/workflows/build_and_push_backend_docker_img.yml
+++ b/.github/workflows/build_and_push_backend_docker_img.yml
@@ -2,8 +2,8 @@ name: Build and Push Backend image to Docker Hub
 
 on:
     push:
-        branches:
-            - 'main'
+#        branches:
+#            - 'main'
         paths:
             - '- "backend/**"'
   
diff --git a/.github/workflows/deploy_zitadel.yml b/.github/workflows/deploy_zitadel.yml
index 3df1eab..a0e6aab 100644
--- a/.github/workflows/deploy_zitadel.yml
+++ b/.github/workflows/deploy_zitadel.yml
@@ -1,5 +1,10 @@
 name: Deploy
-on: ['deployment']
+on: 
+  push:
+#    branches:
+#      - main
+    paths:
+      - 'deployment/zitadel_values.yaml'
 
 jobs:
   deployment:
@@ -21,7 +26,7 @@ jobs:
         value-files: "deployment/database_values.yaml"
       env:
         KUBECONFIG_FILE: '${{ secrets.KUBECONFIG }}'
-        
+
     - name: 'Deploy Zitadel'
       uses: 'vimeda/helm@v1'
       with:
diff --git a/.github/workflows/frontend-ci.yml b/.github/workflows/frontend-ci.yml
index 73204ff..be393f0 100644
--- a/.github/workflows/frontend-ci.yml
+++ b/.github/workflows/frontend-ci.yml
@@ -8,9 +8,9 @@ jobs:
   lint:
     uses: ./.github/workflows/svelte_lint.yml
     with:
-      working-directory: 'backend'
+      working-directory: 'frontend'
   build:
     needs: lint
     uses: ./.github/workflows/svelte_build.yml
     with:
-      working-directory: 'backend'
+      working-directory: 'frontend'
diff --git a/.github/workflows/svelte_build.yml b/.github/workflows/svelte_build.yml
index f5701cb..541ad80 100644
--- a/.github/workflows/svelte_build.yml
+++ b/.github/workflows/svelte_build.yml
@@ -16,9 +16,9 @@ jobs:
           node-version: '21.x'
       - name: Install dependencies
         run: |
-          cd frontend
+          cd ${{ inputs.working-directory }}
           npm ci
       - name: Build
         run: |
-          cd frontend
+          cd ${{ inputs.working-directory }}
           npm run build
\ No newline at end of file
diff --git a/.github/workflows/svelte_lint.yml b/.github/workflows/svelte_lint.yml
index 2f837fc..3eec500 100644
--- a/.github/workflows/svelte_lint.yml
+++ b/.github/workflows/svelte_lint.yml
@@ -16,9 +16,9 @@ jobs:
           node-version: '21.x'
       - name: Install dependencies
         run: |
-          cd frontend
+          cd ${{ inputs.working-directory }}
           npm ci
       - name: Lint
         run: |
-          cd frontend
+          cd ${{ inputs.working-directory }}
           npm run lint
\ No newline at end of file