diff --git a/.github/actions/ci-incr-build-cache-save/action.yml b/.github/actions/ci-incr-build-cache-save/action.yml
index 7ce468b8f2..476deaf9a9 100644
--- a/.github/actions/ci-incr-build-cache-save/action.yml
+++ b/.github/actions/ci-incr-build-cache-save/action.yml
@@ -19,6 +19,7 @@ description: 'Save incremental Gradle caches'
 inputs:
   job-name:
     description: 'job name'
+    default: ${{ github.job }}
   java-version:
     description: 'Java version'
     default: '21'
@@ -27,6 +28,7 @@ runs:
   steps:
     - name: Prepare Gradle caches archive
       shell: bash
+      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
       run: |
         if [[ -d ~/.gradle/caches/ ]] ; then
           echo "::group::Gradle caches / identify updated cache items"
@@ -62,6 +64,7 @@ runs:
         fi
     - name: Archive code-checks incremental
       uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
       with:
         name: ci-gradle-caches-${{ inputs.job-name }}-${{ inputs.java-version }}
         path: ~/ci-gradle-caches-${{ inputs.job-name }}-${{ inputs.java-version }}.tar
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 62bd23442e..f2a31ddc31 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -69,9 +69,6 @@ jobs:
             -x intTest --continue
       - name: Save partial Gradle build cache
         uses: ./.github/actions/ci-incr-build-cache-save
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        with:
-          job-name: 'unit-tests'
       - name: Archive test results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         if: always()
@@ -106,9 +103,6 @@ jobs:
           ./gradlew :polaris-runtime-service:test --continue
       - name: Save partial Gradle build cache
         uses: ./.github/actions/ci-incr-build-cache-save
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        with:
-          job-name: 'quarkus-runtime-tests'
       - name: Archive test results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         if: always()
@@ -141,9 +135,6 @@ jobs:
           ./gradlew :polaris-runtime-service:intTest --continue
       - name: Save partial Gradle build cache
         uses: ./.github/actions/ci-incr-build-cache-save
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        with:
-          job-name: 'quarkus-runtime-inttests'
       - name: Archive test results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         if: always()
@@ -176,9 +167,6 @@ jobs:
           ./gradlew :polaris-admin:test --continue
       - name: Save partial Gradle build cache
         uses: ./.github/actions/ci-incr-build-cache-save
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        with:
-          job-name: 'quarkus-admin-tests'
       - name: Archive test results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         if: always()
@@ -218,9 +206,6 @@ jobs:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       - name: Save partial Gradle build cache
         uses: ./.github/actions/ci-incr-build-cache-save
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        with:
-          job-name: 'integration-tests'
       - name: Archive test results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         if: always()