diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 690151c..0e8c578 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -1,5 +1,8 @@
 when:
   event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
 
 matrix:
   APP:
@@ -22,8 +25,3 @@ steps:
       repo: ${FORGE_NAME}/${CI_REPO}/${APP}
       auto_tag: true
       dockerfile: apps/${APP}/Dockerfile
-    when:
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange
diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml
index d98aae1..56de568 100644
--- a/.woodpecker/deploy.yml
+++ b/.woodpecker/deploy.yml
@@ -1,9 +1,14 @@
 when:
   event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
+
 
 depends_on:
   - build
-  - predeploy
+  - namespace
+  - config
 
 matrix:
   APP:
@@ -26,9 +31,5 @@ steps:
       - export KUBECONFIG=/tmp/kubeconfig
       - echo "Deploying application ${APP} ($IMAGE) to namespace $NAMESPACE"
       - cat deployment/${APP}-deployment.yaml | sed "s,%IMAGE%,$IMAGE,g" | kubectl apply -n $NAMESPACE -f -
-    when:
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange
+    
 
diff --git a/.woodpecker/ingress.yml b/.woodpecker/ingress.yml
index 43da964..18c94d1 100644
--- a/.woodpecker/ingress.yml
+++ b/.woodpecker/ingress.yml
@@ -1,5 +1,9 @@
 when:
   event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
+
 
 depends_on:
   - deploy
@@ -15,9 +19,4 @@ steps:
       - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
       - export KUBECONFIG=/tmp/kubeconfig
       - kubectl apply -f deployment/ingress.yaml -n $NAMESPACE
-    when:
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange
 
diff --git a/.woodpecker/predeploy.yml b/.woodpecker/predeploy.yml
deleted file mode 100644
index 345ea99..0000000
--- a/.woodpecker/predeploy.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-when:
-  event: [tag]
-
-steps:
-  create_namespace:
-    image: quay.io/wollud1969/k8s-admin-helper:0.3.4
-    environment:
-      KUBE_CONFIG_CONTENT:
-        from_secret: kube_config
-      NAMESPACE: "homea2"
-    commands:
-      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
-      - export KUBECONFIG=/tmp/kubeconfig
-      - kubectl create namespace $NAMESPACE || echo "Namespace $NAMESPACE already exists"
-    when:
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange
-
-  apply_configuration:
-    image: quay.io/wollud1969/k8s-admin-helper:0.3.4
-    environment:
-      KUBE_CONFIG_CONTENT:
-        from_secret: kube_config
-      NAMESPACE: "homea2"
-    commands:
-      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
-      - export KUBECONFIG=/tmp/kubeconfig
-      - kubectl create configmap home-automation-config 
-        --from-file=devices.yaml=config/devices.yaml 
-        --from-file=groups.yaml=config/groups.yaml 
-        --from-file=layout.yaml=config/layout.yaml 
-        --from-file=rules.yaml=config/rules.yaml 
-        --from-file=scenes.yaml=config/scenes.yaml 
-        --namespace=$NAMESPACE 
-        --dry-run=client -o yaml | kubectl apply -f - 
-      - kubectl apply -f deployment/configmap.yaml -n $NAMESPACE
-    when:
-      event: [tag]
-