diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index c9c87c2c4..5105816b4 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -1,11 +1,3 @@
-when:
-  - event: [pull_request, tag]
-  - event: push
-    branch:
-      - ${CI_REPO_DEFAULT_BRANCH}
-      - release/*
-      - renovate/*
-
 variables:
   - &golang_image 'docker.io/golang:1.22.0'
   - &node_image 'docker.io/node:21-alpine'
@@ -46,6 +38,15 @@ variables:
       # pipeline config changes
       - '.woodpecker/docker.yaml'
 
+when:
+  - event: [pull_request, tag]
+  - event: push
+    branch:
+      - renovate/*
+  - event: push
+    branch: ${CI_REPO_DEFAULT_BRANCH}
+    path: *when_path
+
 steps:
   vendor:
     image: *golang_image
@@ -59,7 +60,6 @@ steps:
         path: *when_path
       - branch:
           - ${CI_REPO_DEFAULT_BRANCH}
-          - release/*
           - renovate/*
         event: [push, tag]
         path: *when_path
@@ -81,7 +81,6 @@ steps:
         path: *when_path
       - branch:
           - ${CI_REPO_DEFAULT_BRANCH}
-          - release/*
           - renovate/*
         event: [push, tag]
         path: *when_path
@@ -107,9 +106,7 @@ steps:
         path: *when_path
       - event: push
         path: *when_path
-        branch:
-          - release/*
-          - renovate/*
+        branch: renovate/*
 
   cross-compile-server:
     depends_on:
@@ -175,9 +172,7 @@ steps:
         path: *when_path
       - event: push
         path: *when_path
-        branch:
-          - release/*
-          - renovate/*
+        branch: renovate/*
 
   publish-next-server:
     depends_on:
diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml
index fa9337698..f16461515 100644
--- a/.woodpecker/test.yaml
+++ b/.woodpecker/test.yaml
@@ -1,10 +1,3 @@
-when:
-  - event: pull_request
-  - event: push
-    branch:
-      - ${CI_REPO_DEFAULT_BRANCH}
-      - renovate/*
-
 variables:
   - &golang_image 'docker.io/golang:1.21.5'
   - &when
@@ -21,6 +14,14 @@ variables:
       branch: renovate/*
       path: *when_path
 
+when:
+  - event: pull_request
+  - event: push
+    branch: renovate/*
+  - event: push
+    branch: ${CI_REPO_DEFAULT_BRANCH}
+    path: *when_path
+
 steps:
   vendor:
     image: *golang_image
diff --git a/.woodpecker/web.yaml b/.woodpecker/web.yaml
index bf796eeb9..2bab454ec 100644
--- a/.woodpecker/web.yaml
+++ b/.woodpecker/web.yaml
@@ -2,7 +2,6 @@ when:
   - event: pull_request
   - event: push
     branch:
-      - ${CI_REPO_DEFAULT_BRANCH}
       - release/*
       - renovate/*