diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml
index 7948320af..1048d954c 100644
--- a/.github/workflows/bundle.yml
+++ b/.github/workflows/bundle.yml
@@ -24,14 +24,16 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
-          cache: 'gradle'
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Bundle
         env:
           KEY_PATH: ${{ runner.temp }}/keystore.jks
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index ab9b6a444..64ea5b731 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -15,16 +15,19 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
-          cache: 'gradle'
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Lint checks
         run: bundle exec fastlane lint
+
       - name: Archive lint reports
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
@@ -47,7 +50,9 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-          cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Enable KVM
         run: |
diff --git a/.github/workflows/dependency_diff.yml b/.github/workflows/dependency_diff.yml
index e32f33658..9a6092655 100644
--- a/.github/workflows/dependency_diff.yml
+++ b/.github/workflows/dependency_diff.yml
@@ -25,6 +25,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
             ref: ${{ github.head_ref }}
+
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -32,7 +33,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Update dependency diffs
         run: ./update_dependency_diff