diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 6367703dbb9..09686d9aa5c 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -27,8 +27,8 @@ jobs:
         java-version: 17
         cache: gradle
 
-    - name: Validate Gradle Wrapper
-      uses: gradle/wrapper-validation-action@v3
+    - name: Setup Gradle and validate Gradle Wrapper
+      uses: gradle/actions/setup-gradle@v4
 
     - name: Build with Gradle
       run: ./gradlew qa
diff --git a/.github/workflows/diffuse.yml b/.github/workflows/diffuse.yml
index 03353cc4c25..579cdb90113 100644
--- a/.github/workflows/diffuse.yml
+++ b/.github/workflows/diffuse.yml
@@ -31,8 +31,8 @@ jobs:
     - name: Install NDK
       run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.NDK_VERSION }}"
 
-    - name: Validate Gradle Wrapper
-      uses: gradle/wrapper-validation-action@v1
+    - name: Setup Gradle and validate Gradle Wrapper
+      uses: gradle/actions/setup-gradle@v4
 
     - name: Cache base apk
       id: cache-base
diff --git a/gradle.properties b/gradle.properties
index 9a310118192..dc00022a69f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,9 @@ org.gradle.configuration-cache=false
 # See: https://docs.gradle.org/current/userguide/toolchains.html#sub:disable_auto_provision
 org.gradle.java.installations.auto-download=false
 
+org.gradle.caching=true
+org.gradle.parallel=true
+
 # Uncomment these to build libsignal from source.
 # libsignalClientPath=../libsignal
 # org.gradle.dependency.verification=lenient