diff --git a/garnet/bin/auth/account_manager/src/main.rs b/garnet/bin/auth/account_manager/src/main.rs
index a2c1d1ab5a313923c7c957784d5b7ea42904ca6b..2035658b1446a1e45ce325b02c78a55de73a9867 100644
--- a/garnet/bin/auth/account_manager/src/main.rs
+++ b/garnet/bin/auth/account_manager/src/main.rs
@@ -44,7 +44,7 @@ lazy_static! {
     static ref DEFAULT_AUTH_PROVIDER_CONFIG: Vec<AuthProviderConfig> = {
         vec![AuthProviderConfig {
             auth_provider_type: "google".to_string(),
-            url: fuchsia_single_component_package_url!("google_auth_provider").to_string(),
+            url: fuchsia_single_component_package_url!("google_auth_provider_2").to_string(),
             params: None
         }]
     };
diff --git a/garnet/bin/sl4f/src/auth/facade.rs b/garnet/bin/sl4f/src/auth/facade.rs
index c910ad03cffca4ec18372b2a110f3bb5045b9d50..4f146e5dcf843535445a462a0e5e72aa393478e7 100644
--- a/garnet/bin/sl4f/src/auth/facade.rs
+++ b/garnet/bin/sl4f/src/auth/facade.rs
@@ -50,7 +50,8 @@ impl AuthFacade {
     fn discover_injection_service(
         &self,
     ) -> Result<Option<LegacyAuthCredentialInjectorSynchronousProxy>, Error> {
-        let glob_path = "/hub/c/google_auth_provider.cmx/*/out/debug/LegacyAuthCredentialInjector";
+        let glob_path =
+            "/hub/c/google_auth_provider_2.cmx/*/out/debug/LegacyAuthCredentialInjector";
         let found_path = glob(glob_path)?.filter_map(|entry| entry.ok()).next();
         match found_path {
             Some(path) => {
diff --git a/garnet/packages/prod/BUILD.gn b/garnet/packages/prod/BUILD.gn
index 79c62788846946fe933fedb1bada6d556ffdbd2b..ca969c64a3d1ef9e1525f92c2f20ca8590a25306 100644
--- a/garnet/packages/prod/BUILD.gn
+++ b/garnet/packages/prod/BUILD.gn
@@ -134,6 +134,7 @@ group("auth") {
     "//garnet/bin/auth:account_handler",
     "//garnet/bin/auth:account_manager",
     "//garnet/bin/auth:token_manager_factory",
+    "//src/identity/bin/google_auth_provider:google_auth_provider_2",
   ]
 }
 
diff --git a/peridot/bin/basemgr/user_provider_impl.cc b/peridot/bin/basemgr/user_provider_impl.cc
index df7a260770fe3240f5e8f10ce029641ffca5b230..0d12a9ed8af4b203b80c83a8bd5173e5112c6314 100644
--- a/peridot/bin/basemgr/user_provider_impl.cc
+++ b/peridot/bin/basemgr/user_provider_impl.cc
@@ -4,18 +4,18 @@
 
 #include "peridot/bin/basemgr/user_provider_impl.h"
 
-#include <utility>
-
 #include <lib/fit/function.h>
 #include <src/lib/fxl/strings/string_printf.h>
 #include <zircon/status.h>
-#include "src/lib/files/directory.h"
-#include "src/lib/files/file.h"
-#include "src/lib/files/path.h"
+
+#include <utility>
 
 #include "peridot/bin/basemgr/users_generated.h"
 #include "peridot/lib/fidl/clone.h"
 #include "peridot/lib/fidl/json_xdr.h"
+#include "src/lib/files/directory.h"
+#include "src/lib/files/file.h"
+#include "src/lib/files/path.h"
 
 namespace modular {
 
@@ -35,8 +35,8 @@ constexpr char kDevAuthProviderUrl[] =
 // Google auth provider configuration
 constexpr char kGoogleAuthProviderType[] = "google";
 constexpr char kGoogleAuthProviderUrl[] =
-    "fuchsia-pkg://fuchsia.com/google_auth_provider#meta/"
-    "google_auth_provider.cmx";
+    "fuchsia-pkg://fuchsia.com/google_auth_provider_2#meta/"
+    "google_auth_provider_2.cmx";
 
 fuchsia::modular::auth::AccountPtr Convert(
     const fuchsia::modular::UserStorage* const user) {