diff --git a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
index 6359951c..6f805524 100644
--- a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
+++ b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
@@ -32,9 +32,11 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.TransformOrigin
 import androidx.compose.ui.unit.IntOffset
 import androidx.lifecycle.viewmodel.navigation3.ViewModelStoreNavEntryDecorator
+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.SavedStateNavEntryDecorator
 import androidx.navigation3.runtime.entry
 import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import androidx.navigation3.ui.SceneSetupNavEntryDecorator
 import com.android.developers.androidify.camera.CameraPreviewScreen
@@ -73,9 +75,8 @@ fun MainNavigation() {
         backStack = backStack,
         onBack = { backStack.removeLastOrNull() },
         entryDecorators = listOf(
-            SceneSetupNavEntryDecorator,
-            SavedStateNavEntryDecorator,
-            ViewModelStoreNavEntryDecorator,
+            rememberSavedStateNavEntryDecorator(),
+            rememberViewModelStoreNavEntryDecorator(),
         ),
         transitionSpec = {
             ContentTransform(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 71359d62..e5c1860a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,9 +16,9 @@ appcompat = "1.7.0"
 baselineprofile = "1.3.4"
 benchmarkMacroJunit4 = "1.3.4"
 camerax = "1.5.0-SNAPSHOT"
-coilCompose = "3.1.0"
-coilGif = "3.1.0"
-composeBom = "2025.04.01"
+coilCompose = "3.2.0"
+coilGif = "3.2.0"
+composeBom = "2025.05.00"
 concurrent = "1.2.0"
 converterGson = "2.11.0"
 coreKtx = "1.15.0"
@@ -43,7 +43,7 @@ lifecycleViewmodelNavigation3 = "1.0.0-SNAPSHOT"
 loggingInterceptor = "5.0.0-alpha.14"
 material = "1.12.0"
 media3 = "1.6.1"
-navigation3 = "0.1.0-SNAPSHOT"
+navigation3 = "1.0.0-SNAPSHOT"
 okhttp = "4.12.0"
 poseDetection = "18.0.0-beta5"
 profileinstaller = "1.4.1"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c8235999..2778b1ab 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -12,7 +12,7 @@ pluginManagement {
         maven {
             // You can find the maven URL for other artifacts (e.g. KMP, METALAVA) on their
             // build pages.
-            url = uri("https://androidx.dev/snapshots/builds/13467503/artifacts/repository")
+            url = uri("https://androidx.dev/snapshots/builds/13496591/artifacts/repository")
         }
 
     }
@@ -23,7 +23,7 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven {
-            url = uri("https://androidx.dev/snapshots/builds/13467503/artifacts/repository")
+            url = uri("https://androidx.dev/snapshots/builds/13496591/artifacts/repository")
         }
     }
 }