diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml
index afd3090..5924114 100644
--- a/.github/workflows/universal_workflow_light.yaml
+++ b/.github/workflows/universal_workflow_light.yaml
@@ -1173,7 +1173,9 @@ jobs:
             "cypress_container_options="
             "cypress_path=/var/www/html"
           )
-          printf '%s\n' "${vars[@]}" >> "${GITHUB_ENV}"
+          for var in "${vars[@]}"; do
+            printf '%s\n' "$var" >> "${GITHUB_ENV}"
+          done
 
       - name: Convert variables
         id: cy
@@ -1276,6 +1278,22 @@ jobs:
           debug: ${{ needs.init.outputs.debug }}
           token: ${{ github.token }}
 
+      - name: Upload Cypress Screenshots
+        if: always()  # This ensures it runs even if tests fail
+        uses: actions/upload-artifact@v3
+        with:
+          name: cypress-screenshots
+          path: source/vendor/oxid-solution-catalysts/telecash-module/tests/e2e/cypress/_generated/screenshots
+          if-no-files-found: ignore
+
+      - name: Upload Cypress Videos
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: cypress-videos
+          path: source/vendor/oxid-solution-catalysts/telecash-module/tests/e2e/cypress/_generated/videos
+          if-no-files-found: ignore
+
       - name: 'Stop shop'
         if: ${{ always() }}
         uses: 'OXID-eSales/github-actions/stop_shop@v4'