diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4555ae31b52e28b8e3edd707c19d17f45f178002..675afb756db75aed151c95b9ffbfcea8f10c91b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,12 @@ stages:
   rules:
     - if: $CI_PIPELINE_SOURCE != "schedule"
 
+# Configuration for jobs meant to run on each commit to pycodegen/pystencils/master
+.every-commit-master:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "schedule" && $CI_PROJECT_PATH == "pycodegen/lbmpy" && $CI_COMMIT_BRANCH == "master"'
+
+
 # Base configuration for jobs meant to run at a schedule
 .scheduled:
   rules:
@@ -264,6 +270,7 @@ build-documentation:
 
 pages:
   image: i10git.cs.fau.de:5005/pycodegen/pycodegen/full
+  extends: .every-commit-master
   stage: deploy
   needs: ["tests-and-coverage", "build-documentation"]
   script:
@@ -275,5 +282,3 @@ pages:
       - public
   tags:
     - docker
-  only:
-    - master@pycodegen/lbmpy