diff --git a/gradle.properties b/gradle.properties
index 50a4edb3..6e74754a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
 
-# Enabling filesystem watching
+# Enable filesystem watching
 org.gradle.vfs.watch=true
 
 # Enable Kotlin incremental compilation
@@ -14,9 +14,6 @@ kotlin.parallel.tasks.in.project=true
 # Kotlin code style
 kotlin.code.style=official
 
-# Enable incremental annotation processor for KAPT
-kapt.incremental.apt=true
-
 # Turn off AP discovery in compile path to enable compile avoidance
 kapt.include.compile.classpath=false
 
@@ -31,12 +28,17 @@ android.useAndroidX=true
 # transitive dependency references.
 android.nonTransitiveRClass=true
 
-# Only keep the single relevant constructor for types mentioned in XML files
-# instead of using a parameter wildcard which keeps them all.
-android.useMinimalKeepRules=true
+# Generate compile-time only R class for app modules.
+android.enableAppCompileTimeRClass=true
 
-# Enable resource optimizations for release build
-android.enableResourceOptimizations=true
+# Experimental flags
+android.keepWorkerActionServicesBetweenBuilds=true
+android.nonFinalResIds=true
+android.enableRTxtResourceShrinking=true
+android.enablePartialRIncrementalBuilds=true
+android.experimental.enableNewResourceShrinker=true
+android.experimental.enableNewResourceShrinker.preciseShrinking=true
+android.generateManifestClass=true
 
 # Default Android build features
 android.defaults.buildfeatures.buildconfig=false
@@ -44,6 +46,7 @@ android.defaults.buildfeatures.aidl=false
 android.defaults.buildfeatures.renderscript=false
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
+android.library.defaults.buildfeatures.androidresources=false
 
 # Disable warnings about unsupported features, we know what we're doing
 android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings