diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4d5923e9021..af9039fd9a0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 # it needs to match the protobuf version which grpc has transitive dependency on, which
 # needs to match the version of grpc that grpc-kotlin has a transitive dependency on.
 android-lint = "31.3.2"
-androidGradlePlugin = "8.3.2"
+androidGradlePlugin = "8.6.1"
 androidx-test-core="1.5.0"
 androidx-test-junit="1.1.5"
 androidx-test-truth = "1.6.0"
diff --git a/plugins/src/test/resources/BasicProject/firebase-storage/build.gradle b/plugins/src/test/resources/BasicProject/firebase-storage/build.gradle
index 73f26ca1bdb..06a4484e358 100644
--- a/plugins/src/test/resources/BasicProject/firebase-storage/build.gradle
+++ b/plugins/src/test/resources/BasicProject/firebase-storage/build.gradle
@@ -24,6 +24,6 @@ firebaseLibrary {
 }
 
 android{
-    namespace 'com.example.firebase-storage'
+    namespace 'com.example.firebase.storage'
     compileSdkVersion 26
 }