diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
index 82d184ff86..9cd3646747 100644
--- a/.github/workflows/test-integration-unreleased.yml
+++ b/.github/workflows/test-integration-unreleased.yml
@@ -93,8 +93,8 @@ jobs:
 
       - name: Upload Reports
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-reports
+          name: test-reports-os${{ matrix.entry.opensearch_ref }}-java${{ matrix.entry.java }}
           path: opensearch-java/java-client/build/reports/
           retention-days: 7
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
index 07ad568359..42f3b91b47 100644
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -56,9 +56,9 @@ jobs:
 
       - name: Upload Reports
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-reports
+          name: test-reports-os${{ matrix.entry.opensearch_version }}-java${{ matrix.entry.java }}
           path: java-client/build/reports/
           retention-days: 7
 
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
index 90c8693157..2bd50a1615 100644
--- a/.github/workflows/test-unit.yml
+++ b/.github/workflows/test-unit.yml
@@ -22,6 +22,14 @@ jobs:
 
       - name: Run Unit Test
         run: ./gradlew clean unitTest
+
+      - name: Upload Reports
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-reports-java${{ matrix.java }}-${{ runner.os }}
+          path: java-client/build/reports/
+          retention-days: 7
   
   test-java8:
     runs-on: ${{ matrix.os }}
@@ -48,3 +56,11 @@ jobs:
 
       - name: Run Unit Test
         run: ./gradlew clean unitTest -D"runtime.java=8"
+
+      - name: Upload Reports
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-reports-java8-${{ runner.os }}
+          path: java-client/build/reports/
+          retention-days: 7
\ No newline at end of file