diff --git a/.github/workflows/base-windows.yml b/.github/workflows/base-windows.yml
index 44756f5af9db2..504884d837b95 100644
--- a/.github/workflows/base-windows.yml
+++ b/.github/workflows/base-windows.yml
@@ -500,13 +500,10 @@ jobs:
     needs:
       - native-tests
       - get-test-matrix
-    strategy:
-      matrix: ${{ fromJson(needs.get-test-matrix.outputs.tests-matrix) }}
     uses: ./.github/workflows/native-tests-stats-upload.yml
     with:
       artifacts-suffix: ${{ needs.get-test-matrix.outputs.artifacts-suffix }}
       build-stats-tag: ${{ inputs.build-stats-tag }}
-      category: ${{ matrix.category }}
     secrets:
       UPLOAD_COLLECTOR_TOKEN: ${{ secrets.UPLOAD_COLLECTOR_TOKEN }}
 
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index 119d2114a453c..2c8e2457ec226 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -548,13 +548,10 @@ jobs:
     needs:
       - native-tests
       - get-test-matrix
-    strategy:
-      matrix: ${{ fromJson(needs.get-test-matrix.outputs.tests-matrix) }}
     uses: ./.github/workflows/native-tests-stats-upload.yml
     with:
       artifacts-suffix: ${{ needs.get-test-matrix.outputs.artifacts-suffix }}
       build-stats-tag: ${{ inputs.build-stats-tag }}
-      category: ${{ matrix.category }}
     secrets:
       UPLOAD_COLLECTOR_TOKEN: ${{ secrets.UPLOAD_COLLECTOR_TOKEN }}
 
diff --git a/.github/workflows/native-tests-stats-upload.yml b/.github/workflows/native-tests-stats-upload.yml
index 54291b5bf7f45..cea5f0df18397 100644
--- a/.github/workflows/native-tests-stats-upload.yml
+++ b/.github/workflows/native-tests-stats-upload.yml
@@ -11,10 +11,6 @@ on:
         type: string
         description: 'The tag to use for build stats upload of native tests (e.g. 22.3.0-dev-jdk17-mytest-patch-before)'
         default: "null"
-      category:
-        type: string
-        description: 'The native integration test category to upload stats for'
-        default: "null"
     secrets:
       UPLOAD_COLLECTOR_TOKEN:
         description: 'A token used to report build statistics to a collector'
@@ -32,7 +28,7 @@ jobs:
           path: workflow-mandrel
       - uses: actions/download-artifact@v4
         with:
-          name: build-stats-${{inputs.category}}-${{ inputs.artifacts-suffix }}
+          pattern: build-stats-*-${{ inputs.artifacts-suffix }}
           path: .
       - name: Extract and import build stats
         env:
@@ -41,6 +37,12 @@ jobs:
           COLLECTOR_URL: https://collector.foci.life/api/v1/image-stats
         shell: bash
         run: |
-          tar -xf build-stats.tgz
+          ls ./build-stats-*
+          for directory in ./build-stats-*/; do
+            echo "Processing $directory"
+            cd $directory
+            tar -xvf build-stats.tgz
+            cd -
+          done
           echo "Tag for stat upload is going to be: '${BUILD_STATS_TAG}'"
-          DIR=quarkus/ TAG="${BUILD_STATS_TAG}" TOKEN="${UPLOAD_TOKEN}" URL="${COLLECTOR_URL}" bash workflow-mandrel/.github/import_stats.sh
\ No newline at end of file
+          DIR=./ TAG="${BUILD_STATS_TAG}" TOKEN="${UPLOAD_TOKEN}" URL="${COLLECTOR_URL}" bash workflow-mandrel/.github/import_stats.sh
\ No newline at end of file