diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml
index 847ba4e..1c98cbe 100644
--- a/.woodpecker/lint.yml
+++ b/.woodpecker/lint.yml
@@ -6,7 +6,6 @@ steps:
       - gitleaks detect --no-git --verbose --source $CI_WORKSPACE
     when:
       - evaluate: 'CI_PIPELINE_EVENT == "push" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
-      - evaluate: 'CI_PIPELINE_EVENT == "pull_request"'
 
 #    when:
 #      branch:
@@ -20,9 +19,7 @@ steps:
       - hadolint Dockerfile
       - echo $$CI_PIPELINE_EVENT
     when:
-      event:
-        exclude:
-          - tag
+      - evaluate: 'CI_PIPELINE_EVENT == "push" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
 
   shellcheck:
     image: "koalaman/shellcheck-alpine:latest@sha256:7b0682c5786633fc075f69852e5c7521767e8dcb512c43cf8041b022bdc98198"
@@ -34,4 +31,6 @@ steps:
             shellcheck "$file_path"
           fi
         done
+    when:
+      - evaluate: 'CI_PIPELINE_EVENT == "push" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
 ...