diff --git a/.github/workflows/ci-report.yml b/.github/workflows/ci-report.yml
index bf145573a04..c088c0b7e71 100644
--- a/.github/workflows/ci-report.yml
+++ b/.github/workflows/ci-report.yml
@@ -56,11 +56,11 @@ jobs:
         run: |
           shopt -s nullglob # Don't run the loop below if there are no artifacts
           status=0
+          mkdir -p ~/.m2/.develocity/
           for build_scan_data_directory in /tmp/downloaded-build-scan-data/*
           do
             rm -rf ~/.m2/.develocity/build-scan-data
-            mkdir -p ~/.m2/.develocity/build-scan-data
-            tar -xzf "$build_scan_data_directory/build-scan-data.tgz" -C ~/.m2/.develocity/build-scan-data \
+            mv "$build_scan_data_directory" ~/.m2/.develocity/build-scan-data \
             && ./mvnw $MAVEN_ARGS develocity:build-scan-publish-previous || status=1
           done
           exit $status
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd691963ea3..7961af7bf57 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,18 +119,15 @@ jobs:
           -Pjqassistant -Pdist -Pci-build -DskipITs
         env:
           DEVELOCITY_ACCESS_KEY: "${{ secrets.DEVELOCITY_ACCESS_KEY || '' }}"
-      # For jobs running on 'pull_request', tar and upload build scan data.
+      # For jobs running on 'pull_request', upload build scan data.
       # The actual publishing must be done in a separate job (see ci-report.yml).
       # We don't write to the remote cache as that would be unsafe.
-      - name: Tar build scan content pushed to subsequent jobs
-        if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
-        run: tar -czf build-scan-data.tgz -C ~/.m2/.develocity/build-scan-data .
       - name: Upload GitHub Actions artifact for the Develocity build scan
         uses: actions/upload-artifact@v4
         if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
         with:
           name: build-scan-data-initial-${{ matrix.os.name }}
-          path: build-scan-data.tgz
+          path: ~/.m2/.develocity/build-scan-data
 
       - name: Run integration tests in the default environment
         run: |
@@ -140,15 +137,12 @@ jobs:
         env:
           DEVELOCITY_ACCESS_KEY: "${{ secrets.DEVELOCITY_ACCESS_KEY || '' }}"
       # Same as above, but for the build scan of the latest Maven run.
-      - name: Tar build scan content pushed to subsequent jobs
-        if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
-        run: tar -czf build-scan-data.tgz -C ~/.m2/.develocity/build-scan-data .
       - name: Upload GitHub Actions artifact for the Develocity build scan
         uses: actions/upload-artifact@v4
         if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
         with:
           name: build-scan-data-integrationtest-${{ matrix.os.name }}
-          path: build-scan-data.tgz
+          path: ~/.m2/.develocity/build-scan-data
 
       - name: Docker cleanup
         run: ./ci/docker-cleanup.sh