diff --git a/.github/workflows/call-universal_test_workflow.yaml b/.github/workflows/call-universal_test_workflow.yaml
index 9b26b679..ea090ea6 100644
--- a/.github/workflows/call-universal_test_workflow.yaml
+++ b/.github/workflows/call-universal_test_workflow.yaml
@@ -418,6 +418,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ needs.init.outputs.prepare_shop_cache_prefix}}_${{needs.init.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}'
           cache_bucket: ${{ needs.init.outputs.install_shop_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -560,6 +561,7 @@ jobs:
         if: ${{ matrix.testplan != 'skip' }}
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           # yamllint disable-line rule:line-length
           cached_shop: '${{ steps.install_module_testplan.outputs.install_module_load_shop}}_${{steps.install_module_testplan_name.outputs.matrix_suffix}}'
           cache_bucket: ${{ steps.install_module_testplan.outputs.install_module_cache_bucket }}
@@ -791,6 +793,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.phpunit_testplan.outputs.phpunit_load_shop}}_${{ steps.phpunit_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.phpunit_testplan.outputs.phpunit_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -909,6 +912,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.codeception_testplan.outputs.codeception_load_shop}}_${{ steps.codeception_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.codeception_testplan.outputs.codeception_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1047,6 +1051,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.runtest_testplan.outputs.runtest_load_shop}}_${{ steps.runtest_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.runtest_testplan.outputs.runtest_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1193,6 +1198,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.phpmd_testplan.outputs.phpmd_load_shop}}_${{ steps.phpmd_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.phpmd_testplan.outputs.phpmd_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1315,6 +1321,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.phpstan_testplan.outputs.phpstan_load_shop}}_${{ steps.phpstan_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.phpstan_testplan.outputs.phpstan_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1403,6 +1410,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ needs.init.outputs.install_module_cache_prefix}}_${{needs.init.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}'
           cache_bucket: ${{ needs.init.outputs.phpcs_tests_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1590,6 +1598,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.styles_testplan.outputs.styles_load_shop}}_${{ steps.styles_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.styles_testplan.outputs.styles_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
diff --git a/.github/workflows/call-universal_test_workflow.yml b/.github/workflows/call-universal_test_workflow.yml
index 9b26b679..ea090ea6 100644
--- a/.github/workflows/call-universal_test_workflow.yml
+++ b/.github/workflows/call-universal_test_workflow.yml
@@ -418,6 +418,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ needs.init.outputs.prepare_shop_cache_prefix}}_${{needs.init.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}'
           cache_bucket: ${{ needs.init.outputs.install_shop_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -560,6 +561,7 @@ jobs:
         if: ${{ matrix.testplan != 'skip' }}
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           # yamllint disable-line rule:line-length
           cached_shop: '${{ steps.install_module_testplan.outputs.install_module_load_shop}}_${{steps.install_module_testplan_name.outputs.matrix_suffix}}'
           cache_bucket: ${{ steps.install_module_testplan.outputs.install_module_cache_bucket }}
@@ -791,6 +793,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.phpunit_testplan.outputs.phpunit_load_shop}}_${{ steps.phpunit_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.phpunit_testplan.outputs.phpunit_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -909,6 +912,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.codeception_testplan.outputs.codeception_load_shop}}_${{ steps.codeception_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.codeception_testplan.outputs.codeception_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1047,6 +1051,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.runtest_testplan.outputs.runtest_load_shop}}_${{ steps.runtest_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.runtest_testplan.outputs.runtest_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1193,6 +1198,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.phpmd_testplan.outputs.phpmd_load_shop}}_${{ steps.phpmd_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.phpmd_testplan.outputs.phpmd_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1315,6 +1321,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.phpstan_testplan.outputs.phpstan_load_shop}}_${{ steps.phpstan_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.phpstan_testplan.outputs.phpstan_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1403,6 +1410,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ needs.init.outputs.install_module_cache_prefix}}_${{needs.init.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}'
           cache_bucket: ${{ needs.init.outputs.phpcs_tests_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1590,6 +1598,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.styles_testplan.outputs.styles_load_shop}}_${{ steps.styles_testplan_name.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.styles_testplan.outputs.styles_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml
index 5bbb9945..eee5c06f 100644
--- a/.github/workflows/universal_workflow_light.yaml
+++ b/.github/workflows/universal_workflow_light.yaml
@@ -825,6 +825,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.rt.outputs.runscript_load_shop}}_${{ steps.rstn.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.rt.outputs.runscript_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1024,6 +1025,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.rt.outputs.runslim_load_shop}}_${{ steps.rstn.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.rt.outputs.runslim_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml
index 5bbb9945..eee5c06f 100644
--- a/.github/workflows/universal_workflow_light.yml
+++ b/.github/workflows/universal_workflow_light.yml
@@ -825,6 +825,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.rt.outputs.runscript_load_shop}}_${{ steps.rstn.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.rt.outputs.runscript_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
@@ -1024,6 +1025,7 @@ jobs:
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v0'
         with:
+          runs_on: ${{ inputs.runs_on }}
           cached_shop: '${{ steps.rt.outputs.runslim_load_shop}}_${{ steps.rstn.outputs.matrix_suffix }}'
           cache_bucket: ${{ steps.rt.outputs.runslim_cache_bucket }}
           cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}