diff --git a/Build/gitlab-ci/nightly/acceptance-application-composer.yml b/Build/gitlab-ci/nightly/acceptance-application-composer.yml
index 0cc245f877ee9a4725b369a2f79a0882c0967d76..00bc51bf18bdf2cee0a5d8411c4ed29c8998723d 100644
--- a/Build/gitlab-ci/nightly/acceptance-application-composer.yml
+++ b/Build/gitlab-ci/nightly/acceptance-application-composer.yml
@@ -1,4 +1,4 @@
-acceptance application composer mariadb 10.10 php 8.3 max:
+acceptance application composer sys_template mariadb 10.10 php 8.3 max:
   stage: acceptance
   tags:
     - metal2
@@ -13,23 +13,7 @@ acceptance application composer mariadb 10.10 php 8.3 max:
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.3
-    - Build/Scripts/runTests.sh -s acceptanceComposer -d mariadb -i 10.10 -p 8.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
-acceptance application composer sys_template mariadb 10.4 php 8.2 min:
-  stage: acceptance
-  tags:
-    - metal2
-  needs: []
-  only:
-    - schedules
-  artifacts:
-    when: on_failure
-    paths:
-      - typo3temp/var/tests/acceptance-composer/var/log
-      - typo3temp/var/tests/AcceptanceReports
-  parallel: 8
-  script:
-    - Build/Scripts/runTests.sh -s composerInstallMin -p 8.2
-    - Build/Scripts/runTests.sh -s acceptanceComposer -d mariadb -i 10.4 -p 8.2 -t systemplate -c $CI_NODE_INDEX/$CI_NODE_TOTAL
+    - Build/Scripts/runTests.sh -s acceptanceComposer -d mariadb -i 10.10 -t systemplate -p 8.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
 
 acceptance application composer mysql 8.0 php 8.3 max:
   stage: acceptance
@@ -64,7 +48,7 @@ acceptance application composer sys_template mysql 8.0 php 8.2 min:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.2
     - Build/Scripts/runTests.sh -s acceptanceComposer -d mysql -i 8.0 -p 8.2 -t systemplate -c $CI_NODE_INDEX/$CI_NODE_TOTAL
 
-acceptance application composer sqlite php 8.3 max:
+acceptance application composer sys_template sqlite php 8.3 max:
   stage: acceptance
   tags:
     - metal2
@@ -79,25 +63,9 @@ acceptance application composer sqlite php 8.3 max:
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.3
-    - Build/Scripts/runTests.sh -s acceptanceComposer -d sqlite -p 8.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
-acceptance application composer sqlite php 8.2 min:
-  stage: acceptance
-  tags:
-    - metal2
-  needs: []
-  only:
-    - schedules
-  artifacts:
-    when: on_failure
-    paths:
-      - typo3temp/var/tests/acceptance-composer/var/log
-      - typo3temp/var/tests/AcceptanceReports
-  parallel: 8
-  script:
-    - Build/Scripts/runTests.sh -s composerInstallMin -p 8.2
-    - Build/Scripts/runTests.sh -s acceptanceComposer -d sqlite -p 8.2 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
+    - Build/Scripts/runTests.sh -s acceptanceComposer -d sqlite -t systemplate -p 8.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
 
-acceptance application composer postgres 15 php 8.3 max:
+acceptance application composer sys_template postgres 15 php 8.3 max:
   stage: acceptance
   tags:
     - metal2
@@ -112,7 +80,7 @@ acceptance application composer postgres 15 php 8.3 max:
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.3
-    - Build/Scripts/runTests.sh -s acceptanceComposer -d postgres -i 15 -p 8.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
+    - Build/Scripts/runTests.sh -s acceptanceComposer -d postgres -i 15 -t systemplate -p 8.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
 acceptance application composer postgres 10 php 8.2 min:
   stage: acceptance
   tags:
diff --git a/Build/gitlab-ci/nightly/acceptance-application.yml b/Build/gitlab-ci/nightly/acceptance-application.yml
index e9475b0d5e1c54b80969c181794b39de9b549732..2b8320eb2fa891524aa592abc8b4179568b1021b 100644
--- a/Build/gitlab-ci/nightly/acceptance-application.yml
+++ b/Build/gitlab-ci/nightly/acceptance-application.yml
@@ -31,7 +31,7 @@ acceptance application mariadb 10.4 php 8.2 min:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.2
     - Build/Scripts/runTests.sh -s acceptance -d mariadb -i 10.4 -p 8.2 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
 
-acceptance application mysql 8.0 php 8.3 max:
+acceptance application sys_template mysql 8.0 php 8.3 max:
   stage: acceptance
   tags:
     - metal2
@@ -46,23 +46,7 @@ acceptance application mysql 8.0 php 8.3 max:
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.3
-    - Build/Scripts/runTests.sh -s acceptance -d mysql -i 8.0 -p 8.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
-acceptance application mysql 8.0 php 8.2 min:
-  stage: acceptance
-  tags:
-    - metal2
-  needs: []
-  only:
-    - schedules
-  artifacts:
-    when: on_failure
-    paths:
-      - typo3temp/var/tests/acceptance/typo3temp/var/log
-      - typo3temp/var/tests/AcceptanceReports
-  parallel: 8
-  script:
-    - Build/Scripts/runTests.sh -s composerInstallMin -p 8.2
-    - Build/Scripts/runTests.sh -s acceptance -d mysql -i 8.0 -p 8.2 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
+    - Build/Scripts/runTests.sh -s acceptance -d mysql -i 8.0 -t systemplate -p 8.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
 
 acceptance application sqlite php 8.3 max:
   stage: acceptance
@@ -80,7 +64,7 @@ acceptance application sqlite php 8.3 max:
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.3
     - Build/Scripts/runTests.sh -s acceptance -d sqlite -p 8.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
-acceptance application sqlite php 8.2 min:
+acceptance application sys_template sqlite php 8.2 min:
   stage: acceptance
   tags:
     - metal2
@@ -95,7 +79,7 @@ acceptance application sqlite php 8.2 min:
   parallel: 8
   script:
     - Build/Scripts/runTests.sh -s composerInstallMin -p 8.2
-    - Build/Scripts/runTests.sh -s acceptance -d sqlite -p 8.2 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
+    - Build/Scripts/runTests.sh -s acceptance -d sqlite -t systemplate -p 8.2 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
 
 acceptance application postgres 15 php 8.3 max:
   stage: acceptance
@@ -113,19 +97,3 @@ acceptance application postgres 15 php 8.3 max:
   script:
     - Build/Scripts/runTests.sh -s composerInstallMax -p 8.3
     - Build/Scripts/runTests.sh -s acceptance -d postgres -i 15 -p 8.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
-acceptance application postgres 10 php 8.2 min:
-  stage: acceptance
-  tags:
-    - metal2
-  needs: []
-  only:
-    - schedules
-  artifacts:
-    when: on_failure
-    paths:
-      - typo3temp/var/tests/acceptance/typo3temp/var/log
-      - typo3temp/var/tests/AcceptanceReports
-  parallel: 8
-  script:
-    - Build/Scripts/runTests.sh -s composerInstallMin -p 8.2
-    - Build/Scripts/runTests.sh -s acceptance -d postgres -i 10 -p 8.2 -c $CI_NODE_INDEX/$CI_NODE_TOTAL