diff --git a/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yaml b/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yaml
index 0aecbada..245c3e19 100644
--- a/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yaml
+++ b/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yaml
@@ -1,6 +1,6 @@
 prepare_shop:
   matrix: &matrix
-    php: '["8.4"]'
+    php: '["8.4-rc"]'
     mysql: '["8.0.36"]'
 
 install_shop:
diff --git a/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yml b/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yml
index 0aecbada..245c3e19 100644
--- a/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yml
+++ b/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yml
@@ -1,6 +1,6 @@
 prepare_shop:
   matrix: &matrix
-    php: '["8.4"]'
+    php: '["8.4-rc"]'
     mysql: '["8.0.36"]'
 
 install_shop:
diff --git a/run_test_script/action.yaml b/run_test_script/action.yaml
index b01c2ad1..50ac0387 100644
--- a/run_test_script/action.yaml
+++ b/run_test_script/action.yaml
@@ -136,13 +136,22 @@ runs:
         fi
         touch data/php/logs/error_log.txt
         mkdir -p "source/${{ inputs.path }}/${TESTDIR}/Output"
+        cp source/composer.json source/${{ inputs.path }}/${TESTDIR}/Output/
+        cp source/composer.lock source/${{ inputs.path }}/${TESTDIR}/Output/
         cp data/php/logs/error_log.txt source/${{ inputs.path }}/${TESTDIR}/Output/
         cp data/mysql/mysql/slow_log* source/${{ inputs.path }}/${TESTDIR}/Output/
         cp data/mysql/mysql/general_log* source/${{ inputs.path }}/${TESTDIR}/Output/
+        if [ -f source/source/log/oxideshop.log ]; then
+          mkdir -p source/${{ inputs.path }}/${TESTDIR}/Output/source/log
+          cp source/source/log/oxideshop.log source/${{ inputs.path }}/${TESTDIR}/Output/source/log/
+        fi
+        if [ -f source/vendor/oxid-esales/oxideshop-ce/log/oxideshop.log ]; then
+          mkdir -p source/${{ inputs.path }}/${TESTDIR}/Output/source/vendor/oxid-esales/oxideshop-ce/log
+          cp source/vendor/oxid-esales/oxideshop-ce/log/oxideshop.log source/${{ inputs.path }}/${TESTDIR}/Output/source/vendor/oxid-esales/oxideshop-ce/log/
+        fi
         docker compose logs --tail=all >source/${{ inputs.path }}/${TESTDIR}/Output/docker-compose.log
         for c in $(docker ps -aq); do
-          echo -e "\033[0;35m###  Logs for $c ###\033[0m"
-          docker logs -n 2000 $c >source/${{ inputs.path }}/${TESTDIR}/Output/docker-$c.log
+          docker logs -n 2000 $c &>source/${{ inputs.path }}/${TESTDIR}/Output/docker-$c.log
         done
 
     - name: Upload artifact
diff --git a/stop_shop/action.yaml b/stop_shop/action.yaml
index e526b47a..5bbe9f0b 100644
--- a/stop_shop/action.yaml
+++ b/stop_shop/action.yaml
@@ -10,17 +10,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Output docker logs
-      if: always()
-      shell: bash
-      run: |
-        # stop_shop: Output docker logs if make up failed
-        docker compose logs --tail=all >>docker-compose.log
-        for c in $(docker ps -aq); do
-          echo -e "\033[0;35m###  Logs for $c ###\033[0m"
-          docker logs -n 2000 $c >docker-$c.log
-        done
-
     - name: Stop containers
       if: always()
       shell: bash