diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index f380f87f..e642204d 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -13,18 +13,23 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
+
     - name: Checkout project with submodules
       uses: actions/checkout@v4
       with:
         submodules: true
+
     - name: Setup JDK
       uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: 'zulu'
-    - uses: gradle/gradle-build-action@v2
+
+    - uses: gradle/actions/setup-gradle@v3
+
     - name: Run sanity check
       run: ./gradlew --stacktrace test
+
     - name: Run E2E tests
       env:
         ORG_GRADLE_PROJECT_sonatypeUsernameE2E: ${{ secrets.SONATYPE_USERNAME_E2E }}
diff --git a/.github/workflows/gradle-latest-versions.yml b/.github/workflows/gradle-latest-versions.yml
index c9e4fd9c..3181ab64 100644
--- a/.github/workflows/gradle-latest-versions.yml
+++ b/.github/workflows/gradle-latest-versions.yml
@@ -11,11 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'zulu'
-      - uses: gradle/gradle-build-action@v2
+
+      - uses: gradle/actions/setup-gradle@v3
 
       - name: Fetch latest available Gradle versions
         run: |
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 0da33daa..83410b71 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,7 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
+
       - uses: actions/checkout@v4
+
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/java-versions.yml b/.github/workflows/java-versions.yml
index e17ac642..fab42a4c 100644
--- a/.github/workflows/java-versions.yml
+++ b/.github/workflows/java-versions.yml
@@ -19,12 +19,16 @@ jobs:
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     steps:
+
       - uses: actions/checkout@v4
+
       - uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'zulu'
-      - uses: gradle/gradle-build-action@v2
+
+      - uses: gradle/actions/setup-gradle@v3
+
       # Workaround https://github.com/ajoberstar/gradle-stutter/issues/22
       - name: Reduce number of Gradle regressions builds
         run: |
@@ -35,6 +39,7 @@ jobs:
           # The trick is that \2 will greedily eat everything before the last comma.
           sed -r 's/^(.*?)=(.*),(.*)$/\1=\3/g' -i stutter.lockfile
           cat stutter.lockfile
+
       - name: Test cross Java versions compatibility
         run: |
           ./gradlew --version
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 926e1fe7..b8cd284e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,11 +18,15 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
+
     - uses: actions/checkout@v4
+
     - uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: 'zulu'
-    - uses: gradle/gradle-build-action@v2
-      with:
-        arguments: --stacktrace build compatTestJava11
+
+    - uses: gradle/actions/setup-gradle@v3
+
+    - name: "Build and Test"
+      run: ./gradlew --stacktrace build compatTestJava11