diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml
index 80844299..60875f7b 100644
--- a/.woodpecker/lint.yml
+++ b/.woodpecker/lint.yml
@@ -1,3 +1,6 @@
+when:
+  event: [ push, pull_request ]
+
 steps:
   mypy:
     image: python:3
diff --git a/.woodpecker/test-integration.yml b/.woodpecker/test-integration.yml
index f23825ab..91f6a73b 100644
--- a/.woodpecker/test-integration.yml
+++ b/.woodpecker/test-integration.yml
@@ -1,7 +1,20 @@
+when:
+  event: [ push, pull_request ]
+
 steps:
   test_integration:
     image: "python:3.11"
-    secrets: [ci_account1, ci_account1_password, ci_account2, ci_account2_password, ci_muc_server]
+    environment:
+      CI_ACCOUNT1:
+        from_secret: ci_account1
+      CI_ACCOUNT1_PASSWORD:
+        from_secret: ci_account1_password
+      CI_ACCOUNT2:
+        from_secret: ci_account2
+      CI_ACCOUNT2_PASSWORD:
+        from_secret: ci_account2_password
+      CI_MUC_SERVER:
+        from_secret: ci_muc_server
     commands:
       - apt-get update
       - apt-get install -y python3-pip cython3 gpg idn libidn-dev
diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml
index 2862f921..a32748ea 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/test.yml
@@ -1,3 +1,6 @@
+when:
+  event: [ push, pull_request ]
+
 steps:
   unit_tests:
     image: "python:${TAG}"