diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1e195c41..3770fe21 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -69,6 +69,7 @@ dependencies {
     implementation(libs.coil)
     implementation(libs.hilt)
     ksp(libs.hiltCompiler)
+    debugImplementation(libs.androidX.tracing)
     debugImplementation(libs.compose.testManifest)
     testImplementation(libs.bundles.test)
     androidTestImplementation(libs.bundles.androidTest)
diff --git a/build.gradle.kts b/build.gradle.kts
index 3fd510d3..15e25aed 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.serialization) apply false
     alias(libs.plugins.hilt) apply false
-    alias(libs.plugins.versions) apply true
+    alias(libs.plugins.dependencyVersions) apply true
 }
 
 subprojects {
@@ -75,7 +75,7 @@ tasks.withType<Test>().configureEach {
 // Change gradleVersion and run gradlew wrapper to properly update gradle wrapper
 tasks.named<Wrapper>("wrapper") {
     distributionType = Wrapper.DistributionType.BIN
-    gradleVersion = "8.4-rc-1"
+    gradleVersion = "8.5"
 }
 
 task("clean", Delete::class) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4ba86f64..5bb3cf5a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-kotlin = "1.9.10"
-daggerHilt = "2.48"
-compose = "1.6.0-alpha06"
-composeCompiler = "1.5.3"
-ktor = "2.3.4"
-java = "11"
+kotlin = "1.9.21"
+daggerHilt = "2.50"
+compose = "1.6.0-beta03"
+composeCompiler = "1.5.7"
+ktor = "3.0.0-beta-1"
+java = "17"
 minSdk = "21"
 targetSdk = "34"
 compileSdk = "34"
@@ -12,25 +12,26 @@ versionName = "1.3.0"
 versionCode = "4"
 
 [plugins]
-agp = { id = "com.android.application", version = "8.1.1" }
+agp = { id = "com.android.application", version = "8.3.0-alpha18" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "daggerHilt" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-ksp = { id = "com.google.devtools.ksp", version = "1.9.10-1.0.13" }
+ksp = { id = "com.google.devtools.ksp", version = "1.9.21-1.0.16" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-versions = { id = "com.github.ben-manes.versions", version = "0.48.0" }
+dependencyVersions = { id = "com.github.ben-manes.versions", version = "0.50.0" }
 
 [libraries]
 ktorCore = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktorContentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktorOkhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 ktorSerialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
-okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.11" }
-coil = { module = "io.coil-kt:coil-compose", version = "2.4.0" }
-jsonSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.6.0" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.12" }
+coil = { module = "io.coil-kt:coil-compose", version = "2.5.0" }
+jsonSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.6.2" }
 androidX_palette = { module = "androidx.palette:palette", version = "1.0.0" }
-androidX_browser = { module = "androidx.browser:browser", version = "1.6.0" }
-androidX_datastore = { module = "androidx.datastore:datastore-preferences", version = "1.1.0-alpha05" }
-androidX_corektx = { module = "androidx.core:core-ktx", version = "1.12.0" }
+androidX_browser = { module = "androidx.browser:browser", version = "1.8.0-beta01" }
+androidX_datastore = { module = "androidx.datastore:datastore-preferences", version = "1.1.0-alpha07" }
+androidX_corektx = { module = "androidx.core:core-ktx", version = "1.13.0-alpha02" }
+androidX_tracing = { module = "androidx.tracing:tracing", version = "1.2.0" }
 compose_runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
 compose_foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
 compose_layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "compose" }
@@ -44,18 +45,17 @@ compose_uiTest = { module = "androidx.compose.ui:ui-test", version.ref = "compos
 compose_uiTestJunit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
 compose_testManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" }
 compose_paging = { module = "androidx.paging:paging-compose", version = "3.3.0-alpha02" }
-compose_activity = { module = "androidx.activity:activity-compose", version = "1.8.0-rc01" }
-compose_viewModel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.7.0-alpha02" }
-compose_navigation = { module = "androidx.navigation:navigation-compose", version = "2.7.3" }
-compose_hiltNavigation = { module = "androidx.hilt:hilt-navigation-compose", version = "1.1.0-alpha01" }
-compose_constraintLayout = { module = "androidx.constraintlayout:constraintlayout-compose", version = "1.1.0-alpha12" }
-compose_tracing = { module = "androidx.compose.runtime:runtime-tracing", version = "1.0.0-alpha03" }
+compose_activity = { module = "androidx.activity:activity-compose", version = "1.9.0-alpha01" }
+compose_viewModel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.7.0-rc02" }
+compose_navigation = { module = "androidx.navigation:navigation-compose", version = "2.7.6" }
+compose_hiltNavigation = { module = "androidx.hilt:hilt-navigation-compose", version = "1.2.0-alpha01" }
+compose_constraintLayout = { module = "androidx.constraintlayout:constraintlayout-compose", version = "1.1.0-alpha13" }
 hilt = { module = "com.google.dagger:hilt-android", version.ref = "daggerHilt" }
 hiltCompiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "daggerHilt" }
 junit = { module = "junit:junit", version = "4.13.2" }
-junitExt = { module = "androidx.test.ext:junit", version = "1.2.0-alpha01" }
+junitExt = { module = "androidx.test.ext:junit", version = "1.2.0-alpha02" }
 strikt = { module = "io.strikt:strikt-core", version = "0.34.1" }
-coroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.7.3" }
+coroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.8.0-RC" }
 
 [bundles]
 androidX = ["androidX_palette", "androidX_browser", "androidX_datastore", "androidX_corektx"]
@@ -63,7 +63,7 @@ compose = [
     "compose_runtime", "compose_foundation", "compose_layout", "compose_ui", "compose_uiUtil",
     "compose_material", "compose_materialIcons", "compose_animation", "compose_tooling",
     "compose_paging", "compose_activity", "compose_viewModel", "compose_navigation",
-    "compose_hiltNavigation", "compose_constraintLayout", "compose_tracing"
+    "compose_hiltNavigation", "compose_constraintLayout"
 ]
 io = ["okhttp", "jsonSerialization", "ktorCore", "ktorContentNegotiation", "ktorOkhttp", "ktorSerialization"]
 test = ["junit", "strikt", "coroutinesTest"]
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b745ffcc..1af9e093 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e990f1b1..263e1b1e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,4 @@
-rootProject.name = "Jetflix"
+rootProject.name = "jetflix"
 include(":app")
 pluginManagement {
     repositories {