diff --git a/src/com/android/settings/spa/SpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
similarity index 87%
rename from src/com/android/settings/spa/SpaEnvironment.kt
rename to src/com/android/settings/spa/SettingsSpaEnvironment.kt
index 1d693424568..ad903c61cad 100644
--- a/src/com/android/settings/spa/SpaEnvironment.kt
+++ b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
@@ -31,14 +31,13 @@ import com.android.settings.spa.development.UsageStatsPageProvider
 import com.android.settings.spa.home.HomePageProvider
 import com.android.settings.spa.notification.AppListNotificationsPageProvider
 import com.android.settings.spa.notification.NotificationMainPageProvider
-import com.android.settingslib.spa.framework.common.SettingsEntryRepository
 import com.android.settingslib.spa.framework.common.SettingsPage
 import com.android.settingslib.spa.framework.common.SettingsPageProviderRepository
+import com.android.settingslib.spa.framework.common.SpaEnvironment
 import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListTemplate
 
-object SpaEnvironment {
-    val settingsPageProviders: SettingsPageProviderRepository by
-    lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
+object SettingsSpaEnvironment : SpaEnvironment() {
+    override val pageProviderRepository = lazy {
         val togglePermissionAppListTemplate = TogglePermissionAppListTemplate(
             allProviders = listOf(
                 AllFilesAccessAppListProvider,
@@ -66,10 +65,8 @@ object SpaEnvironment {
             ),
         )
     }
-    val settingsEntryRepository: SettingsEntryRepository by
-    lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
-        SettingsEntryRepository(settingsPageProviders)
-    }
 
-    // TODO: add other environment setup here.
+    override val browseActivityClass = SpaActivity::class.java
+
+    override val entryProviderAuthorities = "com.android.settings.spa.provider"
 }
diff --git a/src/com/android/settings/spa/SpaActivity.kt b/src/com/android/settings/spa/SpaActivity.kt
index f161c441fd6..0914193960c 100644
--- a/src/com/android/settings/spa/SpaActivity.kt
+++ b/src/com/android/settings/spa/SpaActivity.kt
@@ -20,7 +20,7 @@ import android.content.Context
 import android.content.Intent
 import com.android.settingslib.spa.framework.BrowseActivity
 
-class SpaActivity : BrowseActivity(SpaEnvironment.settingsPageProviders) {
+class SpaActivity : BrowseActivity(SettingsSpaEnvironment) {
     companion object {
         @JvmStatic
         fun startSpaActivity(context: Context, destination: String) {
@@ -31,4 +31,3 @@ class SpaActivity : BrowseActivity(SpaEnvironment.settingsPageProviders) {
         }
     }
 }
-
diff --git a/src/com/android/settings/spa/SpaDebugActivity.kt b/src/com/android/settings/spa/SpaDebugActivity.kt
index d9a4add1eec..3f055f8ecd7 100644
--- a/src/com/android/settings/spa/SpaDebugActivity.kt
+++ b/src/com/android/settings/spa/SpaDebugActivity.kt
@@ -18,8 +18,4 @@ package com.android.settings.spa
 
 import com.android.settingslib.spa.framework.DebugActivity
 
-class SpaDebugActivity : DebugActivity(
-    SpaEnvironment.settingsEntryRepository,
-    browseActivityClass = SpaActivity::class.java,
-    entryProviderAuthorities = "com.android.settings.spa.provider",
-)
+class SpaDebugActivity : DebugActivity(SettingsSpaEnvironment)
diff --git a/src/com/android/settings/spa/SpaEntryProvider.kt b/src/com/android/settings/spa/SpaEntryProvider.kt
index 5fa7f564599..638cedd5633 100644
--- a/src/com/android/settings/spa/SpaEntryProvider.kt
+++ b/src/com/android/settings/spa/SpaEntryProvider.kt
@@ -18,7 +18,4 @@ package com.android.settings.spa
 
 import com.android.settingslib.spa.framework.EntryProvider
 
-class SpaEntryProvider : EntryProvider(
-    SpaEnvironment.settingsEntryRepository,
-    browseActivityClass = SpaActivity::class.java,
-)
+class SpaEntryProvider : EntryProvider(SettingsSpaEnvironment)