diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 55979ec05..0b8a421cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@7e48093f71aa12588241894ff3695e83c4b5e4b0 # pin@v2.4.2
+        uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v4
 
       - name: Set up Java
         uses: actions/setup-java@v3
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
deleted file mode 100644
index 2b0767b98..000000000
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Validate Gradle Wrapper
-on:
-  push:
-    branches:
-      - main
-      - release/**
-  pull_request:
-
-jobs:
-  validation:
-    name: Validation
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout latest code
-        uses: actions/checkout@v3
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/integration-tests-sentry-cli.yml b/.github/workflows/integration-tests-sentry-cli.yml
index f8c6fcae4..defbc1642 100644
--- a/.github/workflows/integration-tests-sentry-cli.yml
+++ b/.github/workflows/integration-tests-sentry-cli.yml
@@ -22,7 +22,7 @@ jobs:
           python-version: '3.10.5'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@7e48093f71aa12588241894ff3695e83c4b5e4b0 # pin@v2.4.2
+        uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v4
 
       - name: Set up Java
         uses: actions/setup-java@v3
diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml
index 0bf82ef48..0b7fafb94 100644
--- a/.github/workflows/pre-merge.yaml
+++ b/.github/workflows/pre-merge.yaml
@@ -31,7 +31,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@7e48093f71aa12588241894ff3695e83c4b5e4b0 # pin@v2.4.2
+        uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v4
 
       - name: Run Gradle tasks
         if: runner.os != 'Windows'
diff --git a/.github/workflows/test-matrix-agp-gradle.yaml b/.github/workflows/test-matrix-agp-gradle.yaml
index 69bd96e38..b5da1730e 100644
--- a/.github/workflows/test-matrix-agp-gradle.yaml
+++ b/.github/workflows/test-matrix-agp-gradle.yaml
@@ -60,20 +60,14 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-#      - name: Run ./gradlew (Fixes Gradle < 7.4)
-#        continue-on-error: true
-#        uses: gradle/gradle-build-action@7e48093f71aa12588241894ff3695e83c4b5e4b0 # pin@v2.4.2
-#        with:
-#          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-#          gradle-version: ${{ matrix.gradle }}
-#          arguments: tasks
-
-      - name: Build the Release variant
-        uses: gradle/gradle-build-action@7e48093f71aa12588241894ff3695e83c4b5e4b0 # pin@v2.4.2
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v4
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/main' }}
           gradle-version: ${{ matrix.gradle }}
-          arguments: assembleRelease
+
+      - name: Build the Release variant
+        run: gradle assembleRelease
 
       - name: Check sentry-debug-meta.properties inside APKs
         run: |
@@ -85,11 +79,7 @@ jobs:
           rm -r output
 
       - name: Build the Release Bundle variant
-        uses: gradle/gradle-build-action@7e48093f71aa12588241894ff3695e83c4b5e4b0 # pin@v2.4.2
-        with:
-          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-          gradle-version: ${{ matrix.gradle }}
-          arguments: bundleRelease
+        run: gradle bundleRelease
 
       - name: Check sentry-debug-meta.properties inside App Bundle
         run: |
@@ -101,13 +91,7 @@ jobs:
           rm -r output
 
       - name: Run Integration Tests
-        uses: gradle/gradle-build-action@7e48093f71aa12588241894ff3695e83c4b5e4b0 # pin@v2.4.2
-        with:
-          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-          gradle-version: ${{ matrix.gradle }}
-          gradle-home-cache-includes: |
-            **/.gradle-test-kit/caches
-          arguments: integrationTest
+        run: gradle integrationTest
 
       - name: Upload Test Results
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/test-publish.yaml b/.github/workflows/test-publish.yaml
index 4fd9a8e85..b30de6369 100644
--- a/.github/workflows/test-publish.yaml
+++ b/.github/workflows/test-publish.yaml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@7e48093f71aa12588241894ff3695e83c4b5e4b0 # pin@v2.4.2
+        uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v4
 
       - name: Build the Release variant
         run: ./gradlew assembleRelease | tee gradle.log
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06361364c..7be4b8108 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,10 @@
   - Proguard UUID task now depends on the proguard mapping file. I.e. it will only run if the mapping file has changed
   - Source context tasks now depend on source file changes, if there are no source changes, the tasks won't run
 
+### Internal
+
+- Switch to a newer `setup-gradle` github action ([#654](https://github.com/getsentry/sentry-android-gradle-plugin/pull/654))
+
 ### Dependencies
 
 - Bump CLI from v2.25.0 to v2.28.0 ([#638](https://github.com/getsentry/sentry-android-gradle-plugin/pull/638), [#640](https://github.com/getsentry/sentry-android-gradle-plugin/pull/640), [#642](https://github.com/getsentry/sentry-android-gradle-plugin/pull/642), [#647](https://github.com/getsentry/sentry-android-gradle-plugin/pull/647), [#652](https://github.com/getsentry/sentry-android-gradle-plugin/pull/652))