diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8048cb418a80f9a5d8546d782b6a4908568a4a5..f94eac9ff11921c9f72915f3a9fc10264d77fe76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,23 +89,16 @@ stages:
   paths:
     - ./core/node_modules
 
-.pull-composer-cache: &pull-composer-cache
+.with-composer-cache: &with-composer-cache
   cache:
     policy: pull
     <<: *composer-cache
   dependencies:
     - '📦️ Composer'
 
-.with-composer-cache: &with-composer-cache
-  needs:
-    - '📦️ Composer'
-  <<: *pull-composer-cache
-
 .with-yarn-cache: &with-yarn-cache
   dependencies:
     - '📦️ Yarn'
-  needs:
-    - '📦️ Yarn'
   cache:
     policy: pull
     <<: *yarn-cache
diff --git a/.gitlab-ci/pipeline.yml b/.gitlab-ci/pipeline.yml
index 518723eb254a4bf01aab25eafcb7fe8bb08c6132..86edc11d6419b2c70e6ee4bd94b4cd12f38a4864 100644
--- a/.gitlab-ci/pipeline.yml
+++ b/.gitlab-ci/pipeline.yml
@@ -44,23 +44,16 @@ stages:
   paths:
     - ./core/node_modules
 
-.pull-composer-cache: &pull-composer-cache
+.with-composer-cache: &with-composer-cache
+  dependencies:
+    - '📦️ Composer'
   cache:
     policy: pull
     <<: *composer-cache
-  dependencies:
-    - '📦️ Composer'
-
-.with-composer-cache: &with-composer-cache
-  needs:
-    - '📦️ Composer'
-  <<: *pull-composer-cache
 
 .with-yarn-cache: &with-yarn-cache
   dependencies:
     - '📦️ Yarn'
-  needs:
-    - '📦️ Yarn'
   cache:
     policy: pull
     <<: *yarn-cache
@@ -74,16 +67,9 @@ stages:
     reports:
       junit: junit.xml
 
-.with-unit-tests: &with-unit-tests
-  needs:
-    - '⚡️ PHPUnit Unit'
-    - '📦️ Composer'
-  <<: *pull-composer-cache
-
-.with-composer-yarn-and-unit-tests: &with-composer-yarn-and-unit-tests
+.with-composer-and-yarn: &with-composer-and-yarn
   needs:
     - '📦️ Composer'
-    - '⚡️ PHPUnit Unit'
     - '📦️ Yarn'
   dependencies:
     - '📦️ Yarn'
@@ -206,7 +192,7 @@ stages:
     CONCURRENCY: "$CONCURRENCY"
 
 '🌐️️ PHPUnit Functional':
-  <<: [ *with-unit-tests, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
+  <<: [ *with-composer-cache, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
   stage: 🗜️ Test
   parallel: 6
   variables:
@@ -217,7 +203,7 @@ stages:
     - <<: *with-database
 
 '⚙️️ PHPUnit Kernel':
-  <<: [*with-unit-tests, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
+  <<: [*with-composer-cache, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
   stage: 🗜️ Test
   variables:
     <<: *test-variables
@@ -227,7 +213,7 @@ stages:
     - <<: *with-database
 
 '🖱️️️ PHPUnit Functional Javascript':
-  <<: [ *with-unit-tests, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
+  <<: [ *with-composer-cache, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
   stage: 🗜️ Test
   variables:
     <<: *test-variables
@@ -238,7 +224,7 @@ stages:
     - <<: *with-chrome
 
 '👷️️️ PHPUnit Build':
-  <<: [ *with-unit-tests, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
+  <<: [ *with-composer-cache, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
   stage: 🗜️ Test
   variables:
     <<: *test-variables
@@ -248,7 +234,7 @@ stages:
     - <<: *with-database
 
 '🦉️️️ Nightwatch':
-  <<: [ *with-composer-yarn-and-unit-tests, *setup-webserver, *default-job-settings ]
+  <<: [ *with-composer-and-yarn, *setup-webserver, *default-job-settings ]
   stage: 🗜️ Test
   variables:
     <<: *test-variables