diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/connection/navigation/ConnectionNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/connection/navigation/ConnectionNavigation.kt
index 7ccb35c2848..847bb22be2c 100644
--- a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/connection/navigation/ConnectionNavigation.kt
+++ b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/connection/navigation/ConnectionNavigation.kt
@@ -4,7 +4,7 @@ import android.net.Uri
 import androidx.annotation.VisibleForTesting
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/navigation/LocationForSecureConnectionNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/navigation/LocationForSecureConnectionNavigation.kt
index 78de77dd029..268a30b2d8b 100644
--- a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/navigation/LocationForSecureConnectionNavigation.kt
+++ b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/navigation/LocationForSecureConnectionNavigation.kt
@@ -1,6 +1,6 @@
 package io.homeassistant.companion.android.onboarding.locationforsecureconnection.navigation
 
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationsharing/navigation/LocationSharingNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationsharing/navigation/LocationSharingNavigation.kt
index bd4b9609841..e476abeed38 100644
--- a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationsharing/navigation/LocationSharingNavigation.kt
+++ b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationsharing/navigation/LocationSharingNavigation.kt
@@ -1,6 +1,6 @@
 package io.homeassistant.companion.android.onboarding.locationsharing.navigation
 
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/manualserver/navigation/ManualServerNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/manualserver/navigation/ManualServerNavigation.kt
index b50b99f45af..69e6981d0d6 100644
--- a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/manualserver/navigation/ManualServerNavigation.kt
+++ b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/manualserver/navigation/ManualServerNavigation.kt
@@ -1,6 +1,6 @@
 package io.homeassistant.companion.android.onboarding.manualserver.navigation
 
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/nameyourdevice/navigation/NameYourDeviceNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/nameyourdevice/navigation/NameYourDeviceNavigation.kt
index a7834796b90..10a4a2cb11f 100644
--- a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/nameyourdevice/navigation/NameYourDeviceNavigation.kt
+++ b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/nameyourdevice/navigation/NameYourDeviceNavigation.kt
@@ -4,7 +4,7 @@ import androidx.annotation.VisibleForTesting
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.platform.LocalContext
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/serverdiscovery/navigation/ServerDiscoveryNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/serverdiscovery/navigation/ServerDiscoveryNavigation.kt
index f44b7126680..b8fff2c8afb 100644
--- a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/serverdiscovery/navigation/ServerDiscoveryNavigation.kt
+++ b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/serverdiscovery/navigation/ServerDiscoveryNavigation.kt
@@ -1,7 +1,7 @@
 package io.homeassistant.companion.android.onboarding.serverdiscovery.navigation
 
 import androidx.annotation.Keep
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/sethomenetwork/navigation/SetHomeNetworkNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/sethomenetwork/navigation/SetHomeNetworkNavigation.kt
index 3a8f85dedb8..03854da7768 100644
--- a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/sethomenetwork/navigation/SetHomeNetworkNavigation.kt
+++ b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/sethomenetwork/navigation/SetHomeNetworkNavigation.kt
@@ -1,6 +1,6 @@
 package io.homeassistant.companion.android.onboarding.sethomenetwork.navigation
 
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
diff --git a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/wearmtls/navigation/WearMTLSNavigation.kt b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/wearmtls/navigation/WearMTLSNavigation.kt
index 0c6d69cf3e8..6a150272fef 100644
--- a/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/wearmtls/navigation/WearMTLSNavigation.kt
+++ b/app/src/main/kotlin/io/homeassistant/companion/android/onboarding/wearmtls/navigation/WearMTLSNavigation.kt
@@ -1,7 +1,7 @@
 package io.homeassistant.companion.android.onboarding.wearmtls.navigation
 
 import android.net.Uri
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions