diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 32c761766d5..594834a1c37 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -451,7 +451,7 @@ jobs:
           chmod +x run_hammerdb.sh
           run_hammerdb.sh citusbot_tpcc_benchmark_rg
   prepare_parallelization_matrix_32:
-    name: Parallel 32
+    name: Prepare parallelization matrix
     if: ${{ needs.test-flakyness-pre.outputs.tests != ''}}
     needs: test-flakyness-pre
     runs-on: ubuntu-20.04
@@ -537,3 +537,5 @@ jobs:
       shell: bash
     - uses: "./.github/actions/save_logs_and_results"
       if: always()
+      with:
+        folder: test_flakyness_parallel_${{ matrix.id }}
diff --git a/.github/workflows/flaky_test_debugging.yml b/.github/workflows/flaky_test_debugging.yml
index 812fbe2418a..055ba6c6ab7 100644
--- a/.github/workflows/flaky_test_debugging.yml
+++ b/.github/workflows/flaky_test_debugging.yml
@@ -76,4 +76,4 @@ jobs:
     - uses: "./.github/actions/save_logs_and_results"
       if: always()
       with:
-          folder: ${{ matrix.id }}
+          folder: check_flakyness_parallel_${{ matrix.id }}