diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d164fe8aa24ee8a4ebbaa14f7e5dbc0b95742c8..96ddcb7ab1a6a9bd72be8f91ae3b3696c2437fa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,8 +39,8 @@ include:
   - local: '/scripts/ci/extends/vs2019-environment.yml'
   - local: '/scripts/ci/extends/test-artifacts.yml'
   - local: '/scripts/ci/jobs/meta.yml'
-  # jobs, can be indiviually disabled for testing
   - local: '/scripts/ci/jobs/pre-commit.yml'
+  # jobs, can be indiviually disabled for testing
   - local: '/scripts/ci/jobs/build_image.yml'
   - local: '/scripts/ci/jobs/build-linux.yml'
   - local: '/scripts/ci/jobs/build-linux-petsc.yml'
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index 1b92bc84ccc69da8720c44861ab74288fec8c920..b3b2450f5fd576dd66ff7c36130a82f1a8465963 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -24,7 +24,7 @@ build container images:
 build xunit-to-junit image:
   stage: .pre
   rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_PROJECT_NAMESPACE == "bilke" || $CI_PROJECT_NAMESPACE == "ogs"'
       changes:
       - scripts/docker/saxon/**/*
       - scripts/ci/jobs/build_image.yml
@@ -39,7 +39,7 @@ build xunit-to-junit image:
 build pre-commit image:
   stage: .pre
   rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_PROJECT_NAMESPACE == "bilke" || $CI_PROJECT_NAMESPACE == "ogs"'
       changes:
       - scripts/docker/Dockerfile.pre-commit
       - scripts/ci/jobs/build_image.yml
@@ -53,7 +53,7 @@ build pre-commit image:
 build web image:
   stage: .pre
   rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_PROJECT_NAMESPACE == "bilke" || $CI_PROJECT_NAMESPACE == "ogs"'
       changes:
       - scripts/docker/Dockerfile.web
       - scripts/ci/jobs/build_image.yml
diff --git a/scripts/ci/jobs/clang-sanitizer.yml b/scripts/ci/jobs/clang-sanitizer.yml
index 56025a5f2ad5c27bc44638c231f829ac27b403dd..2420e539cef9fd16f49a7ba6c1fd875ab75546b4 100644
--- a/scripts/ci/jobs/clang-sanitizer.yml
+++ b/scripts/ci/jobs/clang-sanitizer.yml
@@ -2,7 +2,7 @@ clang sanitizer:
   stage: check
   extends:
     - .rules-manual
-  dependencies: [meta_container]
+  needs: ["pre commit"]
   variables:
     BUILD_DIR: "build-sanitizer"
     CMAKE_ARGS: "-DOGS_ADDRESS_SANITIZER=ON -DOGS_UNDEFINED_BEHAVIOR_SANITIZER=ON -DOGS_BUILD_UTILS=ON"
diff --git a/scripts/ci/jobs/clang-tidy.yml b/scripts/ci/jobs/clang-tidy.yml
index ae03354c33a1dd8be90c32b36b6be30583d8a0a9..adf3829a0eba437fb43cfa58fe851a61bbc884ba 100644
--- a/scripts/ci/jobs/clang-tidy.yml
+++ b/scripts/ci/jobs/clang-tidy.yml
@@ -2,7 +2,7 @@ clang tidy:
   stage: check
   extends:
     - .rules-manual
-  dependencies: [meta_container]
+  needs: ["pre commit"]
   variables:
     BUILD_DIR: "build-tidy"
     CMAKE_ARGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DCMAKE_CXX_CLANG_TIDY=clang-tidy-9"
diff --git a/scripts/ci/jobs/code-quality.yml b/scripts/ci/jobs/code-quality.yml
index 408f8c59332333f398217cd9ae1f73a1412293ae..dde4ce5be076c2c3bce0882da99272d39766d50d 100644
--- a/scripts/ci/jobs/code-quality.yml
+++ b/scripts/ci/jobs/code-quality.yml
@@ -1,7 +1,7 @@
 cppcheck:
   stage: check
   image: $CONTAINER_GCC_IMAGE
-  dependencies: [meta_container]
+  needs: ["pre commit"]
   before_script:
     - mkdir -p build
     - cd build
diff --git a/scripts/ci/jobs/web.yml b/scripts/ci/jobs/web.yml
index e0f118c29488e13f8b0ec9cf3894fccd53300452..27f8e5e0c9654c95f09e3c3d2986579079f9aa0d 100644
--- a/scripts/ci/jobs/web.yml
+++ b/scripts/ci/jobs/web.yml
@@ -4,7 +4,7 @@ web url checker:
   tags: [ docker ]
   extends:
     - .rules-manual
-  dependencies: [meta_container]
+  needs: ["pre commit"]
   image: $WEB_IMAGE
   script:
     - cd web
@@ -18,7 +18,7 @@ preview web site:
   stage: build
   tags: [ docker ]
   image: $WEB_IMAGE
-  dependencies: [meta_container]
+  needs: ["pre commit"]
   script:
     # HACK to easier linking to the generated pages
     - echo '<meta http-equiv="REFRESH" content="0;URL=web/public/index.html">' >> WebPreview.html
@@ -43,7 +43,7 @@ preview web site:
 deploy web site:
   stage: package
   image: $WEB_IMAGE
-  dependencies: [meta_container]
+  needs: ["pre commit"]
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
       changes: