diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
index bf4dd9153..bd3da79c5 100644
--- a/core/network/build.gradle.kts
+++ b/core/network/build.gradle.kts
@@ -65,8 +65,8 @@ val backendUrl = providers.fileContents(
 
 androidComponents {
     onVariants {
-        it.buildConfigFields.put("BACKEND_URL", backendUrl.map { value ->
-            BuildConfigField(type = "String", value = """"$value"""", comment = null)
+        it.buildConfigFields?.put("BACKEND_URL", backendUrl.map { value ->
+            BuildConfigField(type = "String", value = """"$value"""", comment = "null")
         })
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2b6f96968..e2964f208 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 accompanist = "0.37.0"
 androidDesugarJdkLibs = "2.1.4"
 # AGP and tools should be updated together
-androidGradlePlugin = "8.9.0"
+androidGradlePlugin = "8.11.1"
 androidTools = "31.9.0"
 androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"