diff --git a/gradle.properties b/gradle.properties
index 15305db4..23bb091b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -53,9 +53,6 @@ android.nonTransitiveRClass=true
 # instead of using a parameter wildcard which keeps them all.
 android.useMinimalKeepRules=true
 
-# Enable resource optimizations for release build
-android.enableResourceOptimizations=true
-
 # Default Android build features
 android.defaults.buildfeatures.buildconfig=false
 android.defaults.buildfeatures.aidl=false
@@ -63,8 +60,16 @@ android.defaults.buildfeatures.renderscript=false
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
 
+# Experimental features
+android.disableEarlyManifestParsing=true
+android.enablePartialRIncrementalBuilds=true
+# TODO: enable once we're back on AGP 8.x
+# android.experimental.testOptions.uninstallIncompatibleApks=true
+android.enableBuildConfigAsBytecode=true
+android.experimental.enableNewResourceShrinker.preciseShrinking=true
+
 # Disable warnings about unsupported features, we know what we're doing
-android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings,android.sdk.channel
+android.suppressUnsupportedOptionWarnings=android.disableEarlyManifestParsing,android.enablePartialRIncrementalBuilds,android.enableBuildConfigAsBytecode,android.experimental.enableNewResourceShrinker.preciseShrinking,android.suppressUnsupportedOptionWarnings
 
 # Maven publishing
 GROUP=com.github.android-password-store