diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3db8ea96cb9..5d679996d77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## Next Release
+
+### Internal
+
+- Bump AGP to v9.4.0 
+- Enabled R8 obfuscation for production builds to improve application code protection. 
+- Preserved generated Room DAO class names to maintain SQL performance monitoring functionality.
+
 ## 2026.09.03
 
 ### Internal
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 4eaaa5c6416..69b3046abf9 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,8 +1,8 @@
-# No obfuscation because open source
-# We depend on the convention of generated DAO names by Room in order to support performance profiling.
-# If you decide to obfuscate the final APK, please verify the performance profiling tool continues to function.
+# We obfuscate the final APK while keeping generated Room DAO names unchanged.
+# We depend on the convention of generated DAO names by Room to support performance profiling.
+# If you modify this rule, please verify that the performance profiling tool continues to function.
 # See: https://github.com/simpledotorg/simple-android/issues/2470
--dontobfuscate
+-keepnames class **_RoomDao_Impl
 
 # We process generated Room DAO metadata and use a runtime exception for performance profiling.
 # If you remove this, please ensure that the profiling does not break.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b665d057efe..73a1c19cb3b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "9.3.2"
+agp = "9.4.0"
 
 androidx-cameraView = "1.6.2"
 androidx-camera = "1.6.2"