diff --git a/.woodpecker/build-ci-image.yml b/.woodpecker/build-ci-image.yml
index 95295a27..089b39dd 100644
--- a/.woodpecker/build-ci-image.yml
+++ b/.woodpecker/build-ci-image.yml
@@ -2,10 +2,11 @@
 # Triggers on changes to ci/Dockerfile or manual dispatch.
 
 when:
-  event: [push, manual]
-  branch: master
-  path:
-    include:
+  - event: [push, manual]
+    branch: master
+    evaluate: 'CI_PIPELINE_VARIABLE_ISSUE_NUMBER == ""'
+    path:
+      include:
       - 'ci/Dockerfile'
 
 steps:
diff --git a/.woodpecker/issue-automation.yml b/.woodpecker/issue-automation.yml
index 15ed2774..8fdddc61 100644
--- a/.woodpecker/issue-automation.yml
+++ b/.woodpecker/issue-automation.yml
@@ -1,5 +1,6 @@
 when:
-  event: manual
+  - event: manual
+    evaluate: 'CI_PIPELINE_VARIABLE_ISSUE_NUMBER != ""'
 
 clone:
   git:
diff --git a/.woodpecker/provision-user.yml b/.woodpecker/provision-user.yml
index 0f6d5dab..52e57461 100644
--- a/.woodpecker/provision-user.yml
+++ b/.woodpecker/provision-user.yml
@@ -1,5 +1,6 @@
 when:
-  event: manual
+  - event: manual
+    evaluate: 'CI_PIPELINE_VARIABLE_ISSUE_NUMBER == ""'
 
 clone:
   git: