diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index abe56fc3..f1aa225a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,16 +46,11 @@ jobs:
     if: needs.prerequisites.outputs.runjobs
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up gradle
+        uses: spring-io/spring-gradle-build-action@v2
         with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
-      - name: Set up Gradle
-        uses: gradle/gradle-build-action@v2
-      - name: Set up Gradle user name
-        run: echo 'systemProp.user.name=spring-builds+github' >> gradle.properties
+          java-version: 17
+          distribution: temurin
       - name: Build and run unit tests
         run: |
           ./gradlew clean build -x integrationTest --continue --scan -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD"
@@ -76,10 +71,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up gradle
-        uses: spring-io/spring-gradle-build-action@v1
+        uses: spring-io/spring-gradle-build-action@v2
         with:
-          java-version: '17'
-          distribution: 'temurin'
+          java-version: 17
+          distribution: temurin
       - name: Deploy artifacts
         run: |
           export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"