diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4934347362b..087d84c4bb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@
 - Bump KSP to v2.3.11
 - Remove `android.uniquePackageNames` compatibility flag
 - Remove `android.r8.optimizedResourceShrinking` compatibility flag
+- Remove `android.nonFinalResIds=false` compatibility flag
+- Remove `android.experimental.enableTestFixturesKotlinSupport=true` compatibility flag
 
 ## 2026.08.03
 
diff --git a/gradle.properties b/gradle.properties
index 2179689dc11..22df8af53a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,9 +20,7 @@ defaultProguardFile=proguard-android-optimize.txt
 android.useAndroidX=true
 android.enableJetifier=true
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
 android.suppressUnsupportedCompileSdk=34
-android.experimental.enableTestFixturesKotlinSupport=true
 # Manifest URL endpoint
 # These are currently the same as the API endpoints declared earlier. Those will be removed later
 # once the country selection feature is complete.
@@ -42,11 +40,9 @@ sentryOrg=do_not_change_here
 sentryProject=do_not_change_here
 sentryAuthToken=do_not_change_here
 sentryUploadProguard=true
-# App behaviour
+# App behavior
 disableScreenshot=false
 allowRootedDevice=true
 maestroTests=false
 org.gradle.unsafe.configuration-cache=true
-# AGP 9 compatibility flags (temporary)
-# Remove gradually before AGP 10