diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index 10b7aa315..907dd61f7 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -144,10 +144,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        device-config: [ "pixel4api30aospatd","pixel6api31aosp","pixelCapi30aospatd",
-                         "pixel4api30aospatd","pixel6api31aosp","pixelCapi30aospatd",
-                         "pixel4api30aospatd","pixel6api31aosp","pixelCapi30aospatd",
-                         "pixel4api30aospatd","pixel6api31aosp","pixelCapi30aospatd" ]
+        device-config: [ "pixel4api30aospatd","pixel6api31aosp","pixelCapi30aospatd" ]
 
     steps:
       - name: Delete unnecessary tools 🔧
diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
index 524aa08f5..8a4bff7ab 100644
--- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
+++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
@@ -85,7 +85,7 @@ com.google.dagger:dagger-lint-aar:2.51
 com.google.dagger:dagger:2.51
 com.google.dagger:hilt-android:2.51
 com.google.dagger:hilt-core:2.51
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.guava:listenablefuture:1.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.8.0
 com.squareup.okio:okio:3.8.0
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
index cd36c07b8..234313e1f 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
@@ -34,8 +34,7 @@ internal fun Project.configureAndroidCompose(
         }
 
         composeOptions {
-            kotlinCompilerExtensionVersion =
-                libs.findVersion("androidxComposeCompiler").get().toString()
+            kotlinCompilerExtensionVersion = libs.findVersion("androidxComposeCompiler").get().toString()
         }
 
         dependencies {
@@ -82,7 +81,7 @@ private fun Project.buildComposeMetricsParameters(): List<String> {
         val reportsFolder = buildDir.resolve("compose-reports").resolve(relativePath)
         metricParameters.add("-P")
         metricParameters.add(
-            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + reportsFolder.absolutePath,
+            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + reportsFolder.absolutePath
         )
     }
     return metricParameters.toList()
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt
index 40c619f37..633098604 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt
@@ -21,7 +21,7 @@ enum class NiaFlavor(val dimension: FlavorDimension, val applicationIdSuffix: St
 
 fun configureFlavors(
     commonExtension: CommonExtension<*, *, *, *, *, *>,
-    flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {},
+    flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {}
 ) {
     commonExtension.apply {
         flavorDimensions += FlavorDimension.contentType.name
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index b9bfaee91..4a6bcb66a 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -33,7 +33,6 @@ dependencies {
     api(projects.core.model)
 
     implementation(libs.kotlinx.datetime)
-    implementation("com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava")
 
     androidTestImplementation(projects.core.testing)
 }
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
index 5abc92d9e..548e635bb 100644
--- a/core/designsystem/build.gradle.kts
+++ b/core/designsystem/build.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     api(libs.androidx.compose.ui.util)
 
     implementation(libs.coil.kt.compose)
-    implementation("com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava")
 
     testImplementation(libs.androidx.compose.ui.test)
     testImplementation(libs.accompanist.testharness)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2defa12ba..9bac4398c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 accompanist = "0.32.0"
 androidDesugarJdkLibs = "2.0.4"
 # AGP and tools should be updated together
-androidGradlePlugin = "8.4.0-alpha08"
+androidGradlePlugin = "8.4.0-alpha10"
 androidTools = "31.3.0"
 androidxActivity = "1.8.0"
 androidxAppCompat = "1.6.1"