diff --git a/.github/workflows/reusable-android-test.yml b/.github/workflows/reusable-android-test.yml
index 2f72175ab..1187d6515 100644
--- a/.github/workflows/reusable-android-test.yml
+++ b/.github/workflows/reusable-android-test.yml
@@ -22,7 +22,7 @@ on:
 jobs:
   androidTest:
     runs-on: ubuntu-latest
-    timeout-minutes: 25
+    timeout-minutes: 45
     strategy:
       matrix:
         api-level: ${{ fromJson(inputs.api_levels) }} # Use the input to define the matrix
diff --git a/gradle.properties b/gradle.properties
index dc97717fe..7ba158ca3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Ensure important default jvmargs aren't overwritten. See https://github.com/gradle/gradle/issues/19750
-org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=2g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -40,6 +40,10 @@ org.gradle.caching=true
 # Enable configuration caching between builds.
 org.gradle.configuration-cache=true
 
+# Watches the file system for changes, allowing Gradle to reuse information about the file system
+# between builds.
+org.gradle.vfs.watch=true
+
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn