diff --git a/.github/actions/setup-gradle-build/action.yml b/.github/actions/setup-gradle-build/action.yml
index 27fc5ae088..29c6d20210 100644
--- a/.github/actions/setup-gradle-build/action.yml
+++ b/.github/actions/setup-gradle-build/action.yml
@@ -35,6 +35,4 @@ runs:
         printf "org.gradle.vfs.watch=false\n" >> ~/.gradle/gradle.properties
       shell: bash
 
-    - uses: gradle/actions/setup-gradle@v3
-      with:
-        gradle-home-cache-cleanup: true
+    - uses: gradle/actions/setup-gradle@v4
diff --git a/.github/workflows/generate-changelog.yml b/.github/workflows/generate-changelog.yml
index 6527b9d9a3..c5e1b9f42f 100644
--- a/.github/workflows/generate-changelog.yml
+++ b/.github/workflows/generate-changelog.yml
@@ -16,9 +16,7 @@ jobs:
           distribution: 'zulu'
           java-version: 21
 
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+      - uses: gradle/actions/setup-gradle@v4
 
       - name: Get last released version
         run: echo "version=$(git describe --abbrev=0 --tags)" >> $GITHUB_ENV
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
deleted file mode 100644
index 801432fd68..0000000000
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: "Validate Gradle Wrapper"
-
-on: [push, pull_request]
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
-      - uses: gradle/actions/wrapper-validation@v3