diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml
index de5b8eb29..0e3708260 100644
--- a/.github/workflows/graalvm.yml
+++ b/.github/workflows/graalvm.yml
@@ -29,7 +29,7 @@ jobs:
           gradle-version: ${{ matrix.gradle }}
           arguments: test nativeCompile --init-script build-scan-agree.gradle --scan --info --stacktrace
       - name: Upload wallet-tool as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: wallet-tool-${{ matrix.os }}
+          name: wallet-tool-${{ matrix.os }}-${{ matrix.java-version }}
           path: wallettool/build/native/nativeCompile/wallet-tool
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 6d28d9e58..8c18266e4 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -34,10 +34,10 @@ jobs:
           gradle-version: ${{ matrix.gradle }}
           arguments: -PtestJdk8=true build --init-script build-scan-agree.gradle --scan --info --stacktrace
       - name: Upload Test Results and Reports
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: bitcoinj-core-test-results-jdk${{ matrix.java }}-${{ matrix.os }}
+          name: bitcoinj-core-test-results-jdk${{ matrix.java }}-${{ matrix.os }}-${{ matrix.gradle }}
           path: |
             core/build/reports/tests/test/
             core/build/test-results/test/