diff --git a/.github/ci-gradle.properties b/.github/ci-gradle.properties
new file mode 100644
index 00000000000..7de8afc3ae2
--- /dev/null
+++ b/.github/ci-gradle.properties
@@ -0,0 +1,6 @@
+org.gradle.daemon=false
+org.gradle.parallel=true
+org.gradle.workers.max=2
+
+kotlin.incremental=false
+kotlin.compiler.execution.strategy=in-process
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d3e2769cd2a..8ace88da189 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -21,11 +21,29 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 90
+
     steps:
       - uses: actions/checkout@v4
+
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
+
       - uses: gradle/gradle-build-action@v2
-      - run: ./gradlew assembleDebug detekt spotlessCheck testsOnCi
+
+      - name: Quality - Spotless
+        run: ./gradlew spotlessCheck
+
+      - name: Quality - Detekt
+        run: ./gradlew detekt
+
+      - name: Build
+        run: ./gradlew assembleDebug
+
+      - name: Test
+        run: ./gradlew testsOnCi
diff --git a/gradle.properties b/gradle.properties
index d90d2679b5a..555e9e3b429 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ android.defaults.buildfeatures.shaders=false
 
 # Gradle
 ## Ensure important default jvmargs aren't overwritten. See https://github.com/gradle/gradle/issues/19750
-org.gradle.jvmargs=-Xmx4G -Xms1G -XX:MaxMetaspaceSize=1536M -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError
 
 org.gradle.parallel=true