diff --git a/.github/workflows/test-branch.yml b/.github/workflows/test-branch.yml
index 44006051..8be49b6a 100644
--- a/.github/workflows/test-branch.yml
+++ b/.github/workflows/test-branch.yml
@@ -13,13 +13,11 @@ jobs:
             uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
         -   name: Set up enviroment 🔧
-            uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+            uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
             with:
                 java-version: '21'
                 distribution: 'jetbrains'
-
-        -   name: Set up Gradle 📦
-            uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+                cache: 'gradle'
 
         -   name: Compile parsers 🚀
-            run: ./gradlew compileKotlin --no-configuration-cache
+            run: ./gradlew compileKotlin
diff --git a/.github/workflows/test-parsers.yml b/.github/workflows/test-parsers.yml
index b33a0c3a..85548d79 100644
--- a/.github/workflows/test-parsers.yml
+++ b/.github/workflows/test-parsers.yml
@@ -17,13 +17,11 @@ jobs:
             uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
         -   name: Set up enviroment 🔧
-            uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+            uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
             with:
                 java-version: '21'
                 distribution: 'jetbrains'
-
-        -   name: Set up Gradle 📦
-            uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+                cache: 'gradle'
 
         -   name: Compile parsers 🚀
-            run: ./gradlew compileKotlin --no-configuration-cache
+            run: ./gradlew compileKotlin
diff --git a/gradle.properties b/gradle.properties
index 0ea183e8..8ce898e3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,15 @@
 ## Following this blog:
 # https://proandroiddev.com/how-we-reduced-our-gradle-build-times-by-over-80-51f2b6d6b05b
 kotlin.code.style=official
+systemProp.org.gradle.unsafe.configuration-cache=false
 org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=4096m -XX:+UseParallelGC
 org.gradle.configureondemand=true
-org.gradle.parallel=true
-org.gradle.workers.max=8
-org.gradle.configuration-cache.max-problems=8
+org.gradle.configuration-cache.problems=warn
 
 ## Use these flags on local machine for faster build time
 # org.gradle.caching=true
 # org.gradle.configuration-cache=true
 # org.gradle.vfs.watch=true
+# org.gradle.parallel=true
+# org.gradle.workers.max=8
+# org.gradle.configuration-cache.max-problems=8