diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 366f41c..714219c 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -12,7 +12,7 @@ clone:
 
 steps:
   set_variables:
-    image: "registry.mgrote.net/allzweckcontainer:v1.1.117"
+    image: "registry.mgrote.net/allzweckcontainer:latest"
     commands:
       # set version
       - |
@@ -28,6 +28,9 @@ steps:
       - |
         DATE=$(date --iso-8601=seconds)
         echo "DATE=$DATE" >> .variables
+    when:
+      - event: [push, pull_request]
+        evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
 
   build_and_push: # damit dieser Step laufen kann muss das Repo in der Woodpecker-GUI "privilegiert" sein
     image: "docker:26.1.1"
@@ -53,5 +56,6 @@ steps:
         --label org.opencontainers.image.created=$DATE \
         --file Dockerfile .
     when:
-      - evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
+      - event: [push, pull_request]
+        evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
 ...
diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml
index 5faa4cb..8d2307b 100644
--- a/.woodpecker/lint.yml
+++ b/.woodpecker/lint.yml
@@ -5,14 +5,16 @@ steps:
     commands:
       - gitleaks detect --no-git --verbose --source $CI_WORKSPACE
     when:
-      - evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
+      - event: [push, pull_request]
+        evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
 
   hadolint:
     image: pipelinecomponents/hadolint:0.26.1
     commands:
       - hadolint Dockerfile
     when:
-      - evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
+      - event: [push, pull_request]
+        evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
 
   shellcheck:
     image: "koalaman/shellcheck-alpine:v0.10.0"
@@ -25,5 +27,6 @@ steps:
           fi
         done
     when:
-      - evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
+      - event: [push, pull_request]
+        evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
 ...