diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml
index 2e014215..9e7d8270 100644
--- a/.github/workflows/universal_workflow_light.yml
+++ b/.github/workflows/universal_workflow_light.yml
@@ -184,38 +184,8 @@ jobs:
       init_cache_bucket: ${{ steps.ltp.outputs.init_cache_bucket }}
       init_cache_name: ${{ steps.ltp.outputs.init_cache_name }}
       # install_shop_with_modules variables
-      install_shop_with_modules_add_services: ${{ steps.ltp.outputs.install_shop_with_modules_add_services }}
-      install_shop_with_modules_cache_bucket: ${{ steps.ltp.outputs.install_shop_with_modules_cache_bucket }}
-      install_shop_with_modules_cache_prefix: ${{ steps.ltp.outputs.install_shop_with_modules_cache_prefix }}
-      install_shop_with_modules_cache_prepared_shop: ${{ steps.ltp.outputs.install_shop_with_modules_cache_prepared_shop }}
-      install_shop_with_modules_cache_prepared_shop_prefix: ${{ steps.ltp.outputs.install_shop_with_modules_cache_prepared_shop_prefix }}
-      install_shop_with_modules_composer_root_url: ${{ steps.ltp.outputs.install_shop_with_modules_composer_root_url }}
-      install_shop_with_modules_composer_file: ${{ steps.ltp.outputs.install_shop_with_modules_composer_file }}
-      install_shop_with_modules_composer_transform: ${{ steps.ltp.outputs.install_shop_with_modules_composer_transform }}
-      install_shop_with_modules_composer_backup: ${{ steps.ltp.outputs.install_shop_with_modules_composer_backup }}
-      install_shop_with_modules_composer_update: ${{ steps.ltp.outputs.install_shop_with_modules_composer_update }}
-      install_shop_with_modules_composer_update_options: ${{ steps.ltp.outputs.install_shop_with_modules_composer_update_options}}
-      install_shop_with_modules_composer_dev_ref: ${{ steps.ltp.outputs.install_shop_with_modules_composer_dev_ref }}
-      install_shop_with_modules_container_method: ${{ steps.ltp.outputs.install_shop_with_modules_container_method }}
-      install_shop_with_modules_container_name: ${{ steps.ltp.outputs.install_shop_with_modules_container_name }}
-      install_shop_with_modules_container_options: ${{ steps.ltp.outputs.install_shop_with_modules_container_options }}
-      install_shop_with_modules_custom_ini_error_reporting: ${{ steps.ltp.outputs.install_shop_with_modules_custom_ini_error_reporting }}
-      install_shop_with_modules_custom_ini_xdebug: ${{ steps.ltp.outputs.install_shop_with_modules_custom_ini_xdebug }}
-      install_shop_with_modules_docker_login: ${{ steps.ltp.outputs.install_shop_with_modules_docker_login }}
-      install_shop_with_modules_git_enterprise_ref: ${{ steps.ltp.outputs.install_shop_with_modules_git_enterprise_ref }}
-      install_shop_with_modules_git_sdk_ref: ${{ steps.ltp.outputs.install_shop_with_modules_git_sdk_ref }}
-      install_shop_with_modules_git_sdk_url: ${{ steps.ltp.outputs.install_shop_with_modules_git_sdk_url }}
-      install_shop_with_modules_git_shop_ref: ${{ steps.ltp.outputs.install_shop_with_modules_git_shop_ref }}
-      install_shop_with_modules_git_shop_url: ${{ steps.ltp.outputs.install_shop_with_modules_git_shop_url }}
       install_shop_with_modules_matrix_mysql: ${{ steps.ltp.outputs.install_shop_with_modules_matrix_mysql }}
       install_shop_with_modules_matrix_php: ${{ steps.ltp.outputs.install_shop_with_modules_matrix_php }}
-      install_shop_with_modules_max_parallel: ${{ steps.ltp.outputs.install_shop_with_modules_max_parallel }}
-      install_shop_with_modules_config_idebug: ${{ steps.ltp.outputs.install_shop_with_modules_config_idebug }}
-      install_shop_with_modules_is_enterprise: ${{ steps.ltp.outputs.install_shop_with_modules_is_enterprise }}
-      install_shop_with_modules_custom_script: ${{ steps.ltp.outputs.install_shop_with_modules_custom_script }}
-      install_shop_with_modules_custom_script_container: ${{ steps.ltp.outputs.install_shop_with_modules_custom_script_container }}
-      install_shop_with_modules_output_artifact_prefix: ${{ steps.ltp.outputs.install_shop_with_modules_output_artifact_prefix }}
-      install_shop_with_modules_output_files: ${{ steps.ltp.outputs.install_shop_with_modules_output_files }}
       # runscript variables
       runscript_matrix_mysql: ${{ steps.ltp.outputs.runscript_matrix_mysql }}
       runscript_matrix_php: ${{ steps.ltp.outputs.runscript_matrix_php }}
@@ -249,74 +219,100 @@ jobs:
     runs-on: ${{ fromJSON(inputs.runs_on) }}
 
     steps:
+      - name: Load cached testplan
+        id: istn
+        uses: OXID-eSales/github-actions/load_cached_testplan@v0
+        with:
+          php: ${{ matrix.php }}
+          mysql: ${{ matrix.mysql }}
+          prefix: '${{ needs.init.outputs.global_title }}'
+          root_testplan: ${{ needs.init.outputs.testplan }}
+          matrix_testplan: ''
+          plan_folder: ${{ inputs.plan_folder }}
+          cache_name: ${{ needs.init.outputs.init_cache_name }}
+          cache_endpoint: ${{ secrets.CACHE_ENDPOINT }}
+          cache_access_key: ${{ secrets.CACHE_ACCESS_KEY }}
+          cache_secret_key: ${{ secrets.CACHE_SECRET_KEY }}
+          cache_bucket: ${{ needs.init.outputs.init_cache_bucket }}
+          debug: ${{ needs.init.outputs.debug }}
+
+      - name: 'Load Testplan'
+        id: isltp
+        uses: 'joernott/load_testplan@v1'
+        with:
+          files: '${{steps.istn.outputs.testplan}}'
+          set_output: true
+          set_print: true
+          set_env: true
+          yaml: generated_testplan.yaml
+          token: ${{ secrets.enterprise_github_token }}
+
       - name: 'Prepare Shop'
         id: prepare_shop
         uses: 'OXID-eSales/github-actions/prepare_shop@v0'
         with:
-          container_name: ${{ needs.init.outputs.install_shop_with_modules_container_name }}
-          container_options: ${{ needs.init.outputs.install_shop_with_modules_container_options }}
-          container_method: ${{ needs.init.outputs.install_shop_with_modules_container_method }}
-          docker_login: ${{ needs.init.outputs.install_shop_with_modules_docker_login }}
+          container_name: ${{ steps.isltp.outputs.install_shop_with_modules_container_name }}
+          container_options: ${{ steps.isltp.outputs.install_shop_with_modules_container_options }}
+          container_method: ${{ steps.isltp.outputs.install_shop_with_modules_container_method }}
+          docker_login: ${{ steps.isltp.outputs.install_shop_with_modules_docker_login }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
-          git_sdk_url: ${{ needs.init.outputs.install_shop_with_modules_git_sdk_url }}
-          git_sdk_ref: ${{ needs.init.outputs.install_shop_with_modules_git_sdk_ref }}
-          compilation_url: ${{ needs.init.outputs.install_shop_with_modules_composer_root_url }}
+          git_sdk_url: ${{ steps.isltp.outputs.install_shop_with_modules_git_sdk_url }}
+          git_sdk_ref: ${{ steps.isltp.outputs.install_shop_with_modules_git_sdk_ref }}
+          compilation_url: ${{ steps.isltp.outputs.install_shop_with_modules_composer_root_url }}
           github_ref_name: ${{ github.ref_name }}
           php: ${{ matrix.php }}
           mysql: ${{ matrix.mysql }}
-          custom_ini_error_reporting: ${{ needs.init.outputs.install_shop_with_modules_custom_ini_error_reporting }}
-          custom_ini_xdebug: ${{ needs.init.outputs.install_shop_with_modules_custom_ini_xdebug }}
-          add_services: ${{ needs.init.outputs.install_shop_with_modules_add_services }}
-          composer_file: ${{ needs.init.outputs.install_shop_with_modules_composer_file }}
-          composer_transform: ${{ needs.init.outputs.install_shop_with_modules_composer_transform}}
-          composer_backup: ${{ needs.init.outputs.install_shop_with_modules_composer_backup}}
-          composer_update: ${{ needs.init.outputs.install_shop_with_modules_composer_update}}
-          composer_update_options: ${{ needs.init.outputs.install_shop_with_modules_composer_update_options}}
-          composer_dev_ref: ${{ needs.init.outputs.install_shop_with_modules_composer_dev_ref}}
+          custom_ini_error_reporting: ${{ steps.isltp.outputs.install_shop_with_modules_custom_ini_error_reporting }}
+          custom_ini_xdebug: ${{ steps.isltp.outputs.install_shop_with_modules_custom_ini_xdebug }}
+          add_services: ${{ steps.isltp.outputs.install_shop_with_modules_add_services }}
+          composer_file: ${{ steps.isltp.outputs.install_shop_with_modules_composer_file }}
+          composer_transform: ${{ steps.isltp.outputs.install_shop_with_modules_composer_transform}}
+          composer_backup: ${{ steps.isltp.outputs.install_shop_with_modules_composer_backup}}
+          composer_update: ${{ steps.isltp.outputs.install_shop_with_modules_composer_update}}
+          composer_update_options: ${{ steps.isltp.outputs.install_shop_with_modules_composer_update_options}}
+          composer_dev_ref: ${{ steps.isltp.outputs.install_shop_with_modules_composer_dev_ref}}
           enterprise_github_token: ${{ secrets.enterprise_github_token || github.token }}
           debug: ${{ needs.init.outputs.debug }}
 
       - name: 'Stop shop for preparedShop cache'
-        if: ${{ needs.init.outputs.install_shop_with_modules_cache_prepared_shop == 'true' }}
+        if: ${{ steps.isltp.outputs.install_shop_with_modules_cache_prepared_shop == 'true' }}
         uses: 'OXID-eSales/github-actions/stop_shop@v4'
         with:
           debug: ${{ needs.init.outputs.debug }}
 
       - name: Cache preparedShop on s3
-        if: ${{ needs.init.outputs.install_shop_with_modules_cache_prepared_shop == 'true' && needs.init.outputs.use_private_cache == 'true' }}
+        if: ${{ steps.isltp.outputs.install_shop_with_modules_cache_prepared_shop == 'true' && steps.isltp.outputs.use_private_cache == 'true' }}
         uses: tespkg/actions-cache/save@v1
         with:
           path: |
             ./*
-          # yamllint disable-line rule:line-length
-          key: '${{ needs.init.outputs.install_shop_with_modules_cache_prepared_shop_prefix }}_${{needs.init.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}'
+          key: '${{ steps.isltp.outputs.install_shop_with_modules_cache_prepared_shop_prefix }}_${{steps.istn.outputs.matrix_suffix}}'
           endpoint: ${{ secrets.CACHE_ENDPOINT }}
           accessKey: ${{ secrets.CACHE_ACCESS_KEY }}
           secretKey: ${{ secrets.CACHE_SECRET_KEY }}
-          bucket: ${{ needs.init.outputs.install_shop_with_modules_cache_bucket }}
+          bucket: ${{ steps.isltp.outputs.install_shop_with_modules_cache_bucket }}
 
       - name: Cache preparedShop on github
-        if: ${{ needs.init.outputs.install_shop_with_modules_cache_prepared_shop == 'true' && needs.init.outputs.use_private_cache != 'true'}}
+        if: ${{ steps.isltp.outputs.install_shop_with_modules_cache_prepared_shop == 'true' && steps.isltp.outputs.use_private_cache != 'true'}}
         uses: actions/cache/save@v4
         with:
           path: |
             ./*
-          # yamllint disable-line rule:line-length
-          key: '${{ needs.init.outputs.install_shop_with_modules_cache_prepared_shop_prefix }}_${{needs.init.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}'
+          key: '${{ steps.isltp.outputs.install_shop_with_modules_cache_prepared_shop_prefix }}_${{steps.istn.outputs.matrix_suffix}}'
 
       - name: Debug cache preparedShop
-        if: ${{ inputs.debug == true && needs.init.outputs.install_shop_with_modules_cache_prepared_shop == true }}
+        if: ${{ inputs.debug == true && steps.isltp.outputs.install_shop_with_modules_cache_prepared_shop == true }}
         shell: bash
         run: |
           # install_shop_with_modules: Debug cache current installation
           # we need to add the dot folders here explicitly because bash works differently than the action
           MATRIX='PHP${{matrix.php}}-MYSQL${{matrix.mysql}}'
-          CACHE_NAME="${{ needs.init.outputs.install_shop_with_modules_cache_prepared_shop_prefix}}_${{needs.init.outputs.global_title}}-${MATRIX}"
+          CACHE_NAME="${{ steps.isltp.outputs.install_shop_with_modules_cache_prepared_shop_prefix}}_${{steps.isltp.outputs.global_title}}-${MATRIX}"
           echo "write_cache '${CACHE_NAME}' ./* .env .env.dist .gitignore .git" >>debug/debug.sh
 
       - name: 'Start shop after caching preparedShop'
-        if: ${{ needs.init.outputs.install_shop_with_modules_cache_prepared_shop == 'true' }}
+        if: ${{ steps.isltp.outputs.install_shop_with_modules_cache_prepared_shop == 'true' }}
         shell: bash
         run: |
           # install_shop_with_modules: Start containers
@@ -328,41 +324,40 @@ jobs:
         id: install_shop
         uses: 'OXID-eSales/github-actions/install_shop@v4'
         with:
-          container_name: ${{ needs.init.outputs.install_shop_with_modules_container_name }}
-          container_options: ${{ needs.init.outputs.install_shop_with_modules_container_options }}
-          container_method: ${{ needs.init.outputs.install_shop_with_modules_container_method }}
-          is_enterprise: ${{ needs.init.outputs.install_shop_with_modules_is_enterprise }}
-          config_idebug: ${{ needs.init.outputs.install_shop_with_modules_config_idebug }}
-          output_files: ${{ needs.init.outputs.install_shop_with_modules_output_files }}
-          # yamllint disable-line rule:line-length
-          output_artifact: '${{ needs.init.outputs.install_shop_with_modules_output_artifact_prefix }}-${{needs.init.outputs.global_title}}-PHP${{ matrix.php }}-MYSQL${{ matrix.mysql }}'
+          container_name: ${{ steps.isltp.outputs.install_shop_with_modules_container_name }}
+          container_options: ${{ steps.isltp.outputs.install_shop_with_modules_container_options }}
+          container_method: ${{ steps.isltp.outputs.install_shop_with_modules_container_method }}
+          is_enterprise: ${{ steps.isltp.outputs.install_shop_with_modules_is_enterprise }}
+          config_idebug: ${{ steps.isltp.outputs.install_shop_with_modules_config_idebug }}
+          output_files: ${{ steps.isltp.outputs.install_shop_with_modules_output_files }}
+          output_artifact: '${{ steps.isltp.outputs.install_shop_with_modules_output_artifact_prefix }}-${{steps.istn.outputs.matrix_suffix}}'
           debug: ${{ needs.init.outputs.debug }}
 
       - name: Run custom scripts
         # yamllint disable-line rule:line-length
-        if: ${{ needs.init.outputs.install_shop_with_modules_custom_script != '' || needs.init.outputs.install_shop_with_modules_custom_script_container != '' }}
-        uses: 'OXID-eSales/github-actions/run_custom_scripts@v4'
+        if: ${{ steps.isltp.outputs.install_shop_with_modules_custom_script != '' || steps.isltp.outputs.install_shop_with_modules_custom_script_container != '' }}        uses: 'OXID-eSales/github-actions/run_custom_scripts@v4'
         with:
-          container_name: ${{ needs.init.outputs.install_shop_with_modules_container_name }}
-          container_options: ${{ needs.init.outputs.install_shop_with_modules_container_options }}
-          container_method: ${{ needs.init.outputs.install_shop_with_modules_container_method }}
-          custom_script: ${{ needs.init.outputs.install_shop_with_modules_custom_script }}
-          custom_script_container: ${{ needs.init.outputs.install_shop_with_modules_custom_script_container }}
+          container_name: ${{ steps.isltp.outputs.install_shop_with_modules_container_name }}
+          container_options: ${{ steps.isltp.outputs.install_shop_with_modules_container_options }}
+          container_method: ${{ steps.isltp.outputs.install_shop_with_modules_container_method }}
+          custom_script: ${{ steps.isltp.outputs.install_shop_with_modules_custom_script }}
+          custom_script_container: ${{ steps.isltp.outputs.install_shop_with_modules_custom_script_container }}
           debug: ${{ needs.init.outputs.debug }}
 
       - name: Run composer for each module
         shell: bash
         run: |
           ${{ needs.init.outputs.debug }}
-          PREFIXES=$(echo '${{needs.init.outputs.runscript_matrix_script}}'|tr ',' '\n'|tr -d '[]"'|sed -e 's|-|_|g' -e 's|:.*||'|sort|uniq)
+          PREFIXES=$(echo '${{steps.isltp.outputs.runscript_matrix_script}}'|tr ',' '\n'|tr -d '[]"'|sed -e 's|-|_|g' -e 's|:.*||'|sort|uniq)
           for PREFIX in ${PREFIXES}; do
             VAR="runtest_${PREFIX}_path"
             COMPOSER_PATH="${!VAR}"
-            docker compose ${{ needs.init.outputs.install_shop_with_modules_container_method }} -T \
-            ${{ needs.init.outputs.install_shop_with_modules_container_options }} \
+            echo -e "\033[0;35mRuning composer install for ${PREFIX} in ${COMPOSER_PATH} using 'runtest_${PREFIX}_path'\033[0m"
+            docker compose ${{ steps.isltp.outputs.install_shop_with_modules_container_method }} -T \
+            ${{ steps.isltp.outputs.install_shop_with_modules_container_options }} \
               --workdir "/var/www/${COMPOSER_PATH}" \
-              ${{ needs.init.outputs.install_shop_with_modules_container_name }} \
-              composer update ${{ needs.init.outputs.install_shop_with_modules_composer_update_options}}
+              ${{ steps.isltp.outputs.install_shop_with_modules_container_name }} \
+              composer update ${{ steps.isltp.outputs.install_shop_with_modules_composer_update_options}}
           done
 
       - name: 'Stop shop'
@@ -378,7 +373,7 @@ jobs:
           # install_shop_with_modules: Debug cache current installation
           # we need to add the dot folders here explicitly because bash works differently than the action
           MATRIX='PHP${{matrix.php}}-MYSQL${{matrix.mysql}}'
-          CACHE_NAME="${{ needs.init.outputs.install_shop_with_modules_cache_prefix}}_${{needs.init.outputs.global_title}}-${MATRIX}"
+          CACHE_NAME="${{ steps.isltp.outputs.install_shop_with_modules_cache_prefix}}_${{steps.isltp.outputs.global_title}}-${MATRIX}"
           echo "write_cache '${CACHE_NAME}' ./* .env .env.dist .gitignore .git" >>debug/debug.sh
 
       - name: Cache current installation on s3
@@ -387,11 +382,11 @@ jobs:
         with:
           path: |
             ./*
-          key: '${{ needs.init.outputs.install_shop_with_modules_cache_prefix}}_${{needs.init.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}'
+          key: '${{ steps.isltp.outputs.install_shop_with_modules_cache_prefix}}_${{steps.istn.outputs.matrix_suffix}}'
           endpoint: ${{ secrets.CACHE_ENDPOINT }}
           accessKey: ${{ secrets.CACHE_ACCESS_KEY }}
           secretKey: ${{ secrets.CACHE_SECRET_KEY }}
-          bucket: ${{ needs.init.outputs.install_shop_with_modules_cache_bucket }}
+          bucket: ${{ steps.isltp.outputs.install_shop_with_modules_cache_bucket }}
 
       - name: Cache current installation on github
         if: ${{ needs.init.outputs.use_private_cache != 'true' }}
@@ -399,7 +394,7 @@ jobs:
         with:
           path: |
             ./*
-          key: '${{ needs.init.outputs.install_shop_with_modules_cache_prefix}}_${{needs.init.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}'
+          key: '${{ steps.isltp.outputs.install_shop_with_modules_cache_prefix}}_${{steps.istn.outputs.matrix_suffix}}'
 
       - name: 'Write Report'
         if: always()
@@ -414,8 +409,8 @@ jobs:
           status: ${{job.status}}
           # yamllint disable rule:line-length
           cached_object: |
-            ${{ needs.init.outputs.install_shop_with_modules_cache_prepared_shop_prefix}}_${{needs.init.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}
-            ${{ needs.init.outputs.install_shop_with_modules_cache_prefix}}_${{needs.init.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}
+            ${{ steps.isltp.outputs.install_shop_with_modules_cache_prepared_shop_prefix}}_${{steps.isltp.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}
+            ${{ steps.isltp.outputs.install_shop_with_modules_cache_prefix}}_${{steps.isltp.outputs.global_title}}-PHP${{matrix.php}}-MYSQL${{matrix.mysql}}
           # yamllint enable rule:line-length
           debug: ${{ inputs.debug }}
 
@@ -435,7 +430,7 @@ jobs:
       MATRIX_MYSQL: ${{ matrix.mysql }}
     steps:
       - name: Load cached testplan
-        id: runscript_testplan_name
+        id: rstn
         uses: OXID-eSales/github-actions/load_cached_testplan@v0
         with:
           php: ${{ matrix.php }}
@@ -452,10 +447,10 @@ jobs:
           debug: ${{ needs.init.outputs.debug }}
 
       - name: 'Load Testplan'
-        id: runscript_load_testplan
+        id: rsltp
         uses: 'joernott/load_testplan@v1'
         with:
-          files: '${{steps.runscript_testplan_name.outputs.testplan}}'
+          files: '${{steps.rstn.outputs.testplan}}'
           set_output: true
           set_print: true
           set_env: true
@@ -463,7 +458,7 @@ jobs:
           token: ${{ secrets.enterprise_github_token }}
 
       - name: Convert variables
-        id: runscript_testplan
+        id: rt
         shell: bash
         run: |
           ${{ needs.init.outputs.debug }}
@@ -495,69 +490,69 @@ jobs:
           runscript_${KEY}_delimeter
           EOF
           done
-          SUFFIX="${PREFIX}_${SCRIPT}-${{ steps.runscript_testplan_name.outputs.matrix_suffix }}"
+          SUFFIX="${PREFIX}_${SCRIPT}-${{ steps.rstn.outputs.matrix_suffix }}"
           echo "runscript_suffix=${SUFFIX}"|sed -E 's#"|,|:|<|>|\||\*|\?|\/|\\#_#g' | tee -a "${GITHUB_OUTPUT}"
 
       - name: 'Start shop'
         uses: 'OXID-eSales/github-actions/start_shop@v4'
         with:
-          cached_shop: '${{ steps.runscript_testplan.outputs.runscript_load_shop}}_${{ steps.runscript_testplan_name.outputs.matrix_suffix }}'
-          cache_bucket: ${{ steps.runscript_testplan.outputs.runscript_cache_bucket }}
+          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 }}
           cache_access_key: ${{ secrets.CACHE_ACCESS_KEY }}
           cache_secret_key: ${{ secrets.CACHE_SECRET_KEY }}
-          docker_login: ${{ steps.runscript_testplan.outputs.runscript_docker_login }}
+          docker_login: ${{ steps.rt.outputs.runscript_docker_login }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
           debug: ${{ needs.init.outputs.debug }}
 
       - name: 'Modify composer.json'
-        if: ${{ steps.runscript_testplan.outputs.runscript_composer_transform != '' }}
+        if: ${{ steps.rt.outputs.runscript_composer_transform != '' }}
         uses: 'OXID-eSales/github-actions/composer_merge@v0'
         with:
-          file: 'source/${{ steps.runscript_testplan.outputs.runscript_path }}/composer.json'
+          file: 'source/${{ steps.rt.outputs.runscript_path }}/composer.json'
           backup: true
           transform: |
-            ${{ steps.runscript_testplan.outputs.runscript_composer_transform }}
-          update: ${{ steps.runscript_testplan.outputs.runscript_composer_update }}
-          update_options: ${{ steps.runscript_testplan.outputs.runscript_composer_update_options }}
-          container_name: ${{ steps.runscript_testplan.outputs.runscript_container_name }}
-          container_options: ${{ steps.runscript_testplan.outputs.runscript_container_options }}
+            ${{ steps.rt.outputs.runscript_composer_transform }}
+          update: ${{ steps.rt.outputs.runscript_composer_update }}
+          update_options: ${{ steps.rt.outputs.runscript_composer_update_options }}
+          container_name: ${{ steps.rt.outputs.runscript_container_name }}
+          container_options: ${{ steps.rt.outputs.runscript_container_options }}
           container_method: 'exec'
           debug: ${{ needs.init.outputs.debug }}
           github_token: ${{ secrets.enterprise_github_token || github.token }}
 
       - name: Run custom scripts
-        if: ${{ steps.runscript_testplan.outputs.runscript_custom_script != '' || steps.runscript_testplan.outputs.runscript_custom_script_container != '' }}
+        if: ${{ steps.rt.outputs.runscript_custom_script != '' || steps.rt.outputs.runscript_custom_script_container != '' }}
         uses: 'OXID-eSales/github-actions/run_custom_scripts@v4'
         with:
-          container_name: ${{ steps.runscript_testplan.outputs.runscript_container_name }}
-          container_options: ${{ steps.runscript_testplan.outputs.runscript_container_options }}
-          container_method: ${{ steps.runscript_testplan.outputs.runscript_container_method }}
-          custom_script: ${{ steps.runscript_testplan.outputs.runscript_custom_script }}
-          custom_script_container: ${{ steps.runscript_testplan.outputs.runscript_custom_script_container }}
+          container_name: ${{ steps.rt.outputs.runscript_container_name }}
+          container_options: ${{ steps.rt.outputs.runscript_container_options }}
+          container_method: ${{ steps.rt.outputs.runscript_container_method }}
+          custom_script: ${{ steps.rt.outputs.runscript_custom_script }}
+          custom_script_container: ${{ steps.rt.outputs.runscript_custom_script_container }}
           debug: ${{ needs.init.outputs.debug }}
 
       - name: 'Run runscript check'
         uses: 'OXID-eSales/github-actions/run_composer_script@v0'
         with:
-          script: ${{ steps.runscript_testplan.outputs.runscript_script }}
-          path: ${{ steps.runscript_testplan.outputs.runscript_path }}
-          run_composer_install: ${{ steps.runscript_testplan.outputs.runscript_run_composer_install }}
-          install_options: ${{ steps.runscript_testplan.outputs.runscript_install_options }}
-          container_name: ${{ steps.runscript_testplan.outputs.runscript_container_name }}
-          container_options: ${{ steps.runscript_testplan.outputs.runscript_container_options }}
-          container_method: ${{ steps.runscript_testplan.outputs.runscript_container_method }}
-          output_artifact: ${{ steps.runscript_testplan.outputs.runscript_output_prefix}}-${{steps.runscript_testplan.outputs.runscript_suffic }}
+          script: ${{ steps.rt.outputs.runscript_script }}
+          path: ${{ steps.rt.outputs.runscript_path }}
+          run_composer_install: ${{ steps.rt.outputs.runscript_run_composer_install }}
+          install_options: ${{ steps.rt.outputs.runscript_install_options }}
+          container_name: ${{ steps.rt.outputs.runscript_container_name }}
+          container_options: ${{ steps.rt.outputs.runscript_container_options }}
+          container_method: ${{ steps.rt.outputs.runscript_container_method }}
+          output_artifact: ${{ steps.rt.outputs.runscript_output_prefix}}-${{steps.rt.outputs.runscript_suffic }}
           debug: ${{ needs.init.outputs.debug }}
           github_token: ${{ secrets.enterprise_github_token || github.token }}
 
       - name: Upload coverage report
-        if: ${{ always() && steps.runscript_testplan.outputs.runscript_coverage_prefix != '' }}
+        if: ${{ always() && steps.rt.outputs.runscript_coverage_prefix != '' }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.runscript_testplan.outputs.runscript_coverage_prefix}}-${{steps.runscript_testplan.outputs.runscript_suffic }}
-          path: source/${{ steps.runscript_testplan.outputs.runscript_path }}/tests/Reports/*.xml
+          name: ${{ steps.rt.outputs.runscript_coverage_prefix}}-${{steps.rt.outputs.runscript_suffic }}
+          path: source/${{ steps.rt.outputs.runscript_path }}/tests/Reports/*.xml
 
       - name: 'Stop shop'
         if: ${{ always() }}
diff --git a/run_composer_script/action.yml b/run_composer_script/action.yml
index 597164e7..ea2e9955 100644
--- a/run_composer_script/action.yml
+++ b/run_composer_script/action.yml
@@ -70,7 +70,7 @@ runs:
       if: always()
       shell: bash
       run: |
-        # styles: Output php error log
+        # run_composer_script: Output php error log
         ${{ inputs.debug }}
         if [ -s data/php/logs/error_log.txt ]; then
           echo -e "\033[0;35mPHP error log\033[0m"