diff --git a/.github/oxid-esales/codeception_acceptance_70x.yml b/.github/oxid-esales/codeception_acceptance_70x.yml
index f6e0f081a4..1800fa5759 100644
--- a/.github/oxid-esales/codeception_acceptance_70x.yml
+++ b/.github/oxid-esales/codeception_acceptance_70x.yml
@@ -1,6 +1,6 @@
 codeception:
   title: codeception_acceptance
-  suite: 'acceptance'
+  suite: 'acceptance,acceptanceAdmin'
   additional_options: '--coverage-xml=/var/www/coverage_codeception_acceptance.xml'
   logfile:
     prefix: 'codeception'
diff --git a/.github/oxid-esales/shop_ce_70x.yml b/.github/oxid-esales/shop_ce_70x.yml
index d665b91dc9..acef2169de 100644
--- a/.github/oxid-esales/shop_ce_70x.yml
+++ b/.github/oxid-esales/shop_ce_70x.yml
@@ -12,5 +12,9 @@ phpcs_tests:
   diff_only: false
   filter: '^\./source/Internal/.*\.php$'
 
+sonarcloud:
+  matrix:
+    testplan: '["-","~/sonarcloud_oxideshop_ce_internal.yml"]'
+
 finish:
   slack_title: 'Full matrix CE ({{ .Data.global.git.shop_ref }}) on {{ .Github.Repository }} by {{ .Github.Actor }}'
diff --git a/.github/oxid-esales/slim_matrix_ce_70x.yml b/.github/oxid-esales/slim_matrix_ce_70x.yml
new file mode 100644
index 0000000000..74d3b385cc
--- /dev/null
+++ b/.github/oxid-esales/slim_matrix_ce_70x.yml
@@ -0,0 +1,28 @@
+# This config depends on the defaults.yml testplan
+# Only diverging settings are defined here
+phpunit:
+  additional_options: ''
+  coverage:
+    path: ''
+
+codeception:
+  matrix:
+    testplan: '["~/codeception_acceptance_70x.yml","~/codeception_acceptanceSetup_70x.yml"]'
+  # Running on public runners, this should pose no problem
+  max_parallel: &codeception_max_parallel 4
+  coverage:
+    path: ''
+
+runtest:
+  matrix:
+    testplan: 'skip'
+
+sonarcloud:
+  matrix:
+    testplan: 'skip'
+
+phpcs_tests:
+  skip: true
+
+finish:
+  slack_title: 'Slim matrix CE ({{ .Data.global.git.shop_ref }}) on {{ .Github.Repository }} by {{ .Github.Actor }}'
diff --git a/.github/workflows/nightly_matrix_full_ce_70x.yml b/.github/workflows/nightly_matrix_full_ce_70x.yml
index 75dccba2e3..c8bd82bd88 100644
--- a/.github/workflows/nightly_matrix_full_ce_70x.yml
+++ b/.github/workflows/nightly_matrix_full_ce_70x.yml
@@ -12,6 +12,7 @@ jobs:
       testplan: '~/defaults/7.0.x.yml,~/defaults/scheduled.yml,~/shop_ce_70x.yml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/.github/workflows/nightly_matrix_full_ce_71x.yml b/.github/workflows/nightly_matrix_full_ce_71x.yml
index be75d6734c..e3c8d7b2b5 100644
--- a/.github/workflows/nightly_matrix_full_ce_71x.yml
+++ b/.github/workflows/nightly_matrix_full_ce_71x.yml
@@ -12,6 +12,7 @@ jobs:
       testplan: '~/defaults/7.1.x.yml,~/defaults/scheduled.yml,~/shop_ce.yml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/.github/workflows/nightly_matrix_full_ce_80x.yml b/.github/workflows/nightly_matrix_full_ce_80x.yml
index 50a828cffd..c9b5480b75 100644
--- a/.github/workflows/nightly_matrix_full_ce_80x.yml
+++ b/.github/workflows/nightly_matrix_full_ce_80x.yml
@@ -12,6 +12,7 @@ jobs:
       testplan: '~/shop_ce.yml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/.github/workflows/nightly_smarty_70x.yml b/.github/workflows/nightly_smarty_70x.yml
index 077df5d8a3..dc0602be81 100644
--- a/.github/workflows/nightly_smarty_70x.yml
+++ b/.github/workflows/nightly_smarty_70x.yml
@@ -12,6 +12,7 @@ jobs:
       testplan: '~/defaults/7.0.x.yml,~/defaults/scheduled.yml,~/smarty_7.0.x.yml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/.github/workflows/pull_matrix_full_ce_70x.yml b/.github/workflows/pull_matrix_full_ce_70x.yml
index b8552039ec..34f925dd94 100644
--- a/.github/workflows/pull_matrix_full_ce_70x.yml
+++ b/.github/workflows/pull_matrix_full_ce_70x.yml
@@ -3,12 +3,8 @@ name: Auto trigger on PR to 7.0.x*
 
 on:
   pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
     branches:
-      - b-7.0.x
+      - 'b-7.0.x**'
 
 jobs:
   oxideshop_ce_pull_70x:
@@ -17,6 +13,7 @@ jobs:
       testplan: '~/defaults/7.0.x.yml,~/shop_ce_70x.yml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/.github/workflows/pull_matrix_full_ce_71x.yml b/.github/workflows/pull_matrix_full_ce_71x.yml
index 03d514b4e5..e9ca0f490d 100644
--- a/.github/workflows/pull_matrix_full_ce_71x.yml
+++ b/.github/workflows/pull_matrix_full_ce_71x.yml
@@ -3,12 +3,8 @@ name: Auto trigger on PR to 7.1.x*
 
 on:
   pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
     branches:
-      - b-7.1.x
+      - 'b-7.1.x**'
 
 jobs:
   oxideshop_ce_pull_71x:
@@ -17,6 +13,7 @@ jobs:
       testplan: '~/defaults/7.1.x.yml,~/full_matrix_ce.yml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/.github/workflows/pull_matrix_full_ce_80x.yml b/.github/workflows/pull_matrix_full_ce_80x.yml
index 54ef1eee5b..1ea8d90439 100644
--- a/.github/workflows/pull_matrix_full_ce_80x.yml
+++ b/.github/workflows/pull_matrix_full_ce_80x.yml
@@ -3,12 +3,8 @@ name: Auto trigger on PR to 8.0.x*
 
 on:
   pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
     branches:
-      - b-8.0.x
+      - 'b-8.0.x**'
 
 jobs:
   oxideshop_ce_pull:
@@ -17,6 +13,7 @@ jobs:
       testplan: '~/full_matrix_ce.yml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/.github/workflows/push_matrix_full_ce_80x.yml b/.github/workflows/push_matrix_full_ce_80x.yml
index e30f24ad0e..82879eaf62 100644
--- a/.github/workflows/push_matrix_full_ce_80x.yml
+++ b/.github/workflows/push_matrix_full_ce_80x.yml
@@ -13,6 +13,7 @@ jobs:
       testplan: '~/shop_ce.yml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/.github/workflows/push_matrix_slim_ce_70x.yml b/.github/workflows/push_matrix_slim_ce_70x.yml
index cc01ffc673..9acc1118c0 100644
--- a/.github/workflows/push_matrix_slim_ce_70x.yml
+++ b/.github/workflows/push_matrix_slim_ce_70x.yml
@@ -10,9 +10,10 @@ jobs:
   oxideshop_ce_push_b70x:
     uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v4
     with:
-      testplan: '~/defaults/7.0.x.yml,~/defaults/php8.1_mysql_57.only.yml,~/slim_matrix_ce.yml'
+      testplan: '~/defaults/7.0.x.yml,~/defaults/php8.1_mysql5.7_only.yml,~/slim_matrix_ce_70x.yml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/.github/workflows/push_matrix_slim_ce_71x.yml b/.github/workflows/push_matrix_slim_ce_71x.yml
index 58a1a64ac0..d3a3f0807c 100644
--- a/.github/workflows/push_matrix_slim_ce_71x.yml
+++ b/.github/workflows/push_matrix_slim_ce_71x.yml
@@ -10,9 +10,10 @@ jobs:
   oxideshop_ce_push_b71x:
     uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v4
     with:
-      testplan: '~/defaults/7.1.x.yml,~/defaults/php8.2_mysql_57.only.yml,~/slim_matrix_ce.yml'
+      testplan: '~/defaults/7.1.x.yml,~/defaults/php8.2_mysql5.7_only.yml,~/slim_matrix_ce.yml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}