diff --git a/build-logic/structure/src/main/kotlin/AndroidApplicationPlugin.kt b/build-logic/structure/src/main/kotlin/AndroidApplicationPlugin.kt
index 476e0e364..f690b2585 100644
--- a/build-logic/structure/src/main/kotlin/AndroidApplicationPlugin.kt
+++ b/build-logic/structure/src/main/kotlin/AndroidApplicationPlugin.kt
@@ -23,11 +23,6 @@ class AndroidApplicationPlugin : Plugin<Project> {
                     versionCode = DefaultConfig.versionCode
                     versionName = DefaultConfig.versionName
                 }
-                buildFeatures {
-                    aidl = false
-                    renderScript = false
-                    shaders = false
-                }
             }
             dependencies {
                 add("implementation", embeddedKotlin("stdlib"))
diff --git a/build-logic/structure/src/main/kotlin/AndroidLibraryPlugin.kt b/build-logic/structure/src/main/kotlin/AndroidLibraryPlugin.kt
index 4192f6859..3235039fb 100644
--- a/build-logic/structure/src/main/kotlin/AndroidLibraryPlugin.kt
+++ b/build-logic/structure/src/main/kotlin/AndroidLibraryPlugin.kt
@@ -31,12 +31,6 @@ class AndroidLibraryPlugin : Plugin<Project> {
                         isMinifyEnabled = false
                     }
                 }
-                buildFeatures {
-                    aidl = false
-                    renderScript = false
-                    shaders = false
-                    resValues = false
-                }
             }
             extensions.configure<LibraryAndroidComponentsExtension> {
                 beforeVariants {
diff --git a/gradle.properties b/gradle.properties
index 24ffcbb42..c314a083c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,5 +18,10 @@ android.nonFinalResIds=true
 android.enableJetifier=false
 android.enableR8.fullMode=true
 android.nonTransitiveRClass=true
+org.gradle.caching=true
 org.gradle.configuration-cache=true
+android.defaults.buildfeatures.aidl=false
 android.defaults.buildfeatures.buildconfig=false
+android.defaults.buildfeatures.renderscript=false
+android.defaults.buildfeatures.resvalues=false
+android.defaults.buildfeatures.shaders=false