diff --git a/app-check/app-check-sdk/build.gradle.kts b/app-check/app-check-sdk/build.gradle.kts
index 04b572f1e..73c22f849 100644
--- a/app-check/app-check-sdk/build.gradle.kts
+++ b/app-check/app-check-sdk/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
 
     implementation(libs.auth.java.jwt)
     implementation(libs.auth.jwks.rsa)
+    implementation(libs.google.guava.jre)
 
     with(libs.ktor.client) {
         implementation(auth)
diff --git a/build-plugins/src/main/kotlin/io.ashdavies.cloud.gradle.kts b/build-plugins/src/main/kotlin/io.ashdavies.cloud.gradle.kts
index 96be1ab3c..7f89e08e4 100644
--- a/build-plugins/src/main/kotlin/io.ashdavies.cloud.gradle.kts
+++ b/build-plugins/src/main/kotlin/io.ashdavies.cloud.gradle.kts
@@ -12,8 +12,6 @@ compose {
     kotlinCompilerPlugin.set("$composeCompiler")
 }
 
-configurations.create("invoker")
-
 dependencies {
     implementation(compose.foundation)
     implementation(compose.runtime)
diff --git a/cloud-firestore/build.gradle.kts b/cloud-firestore/build.gradle.kts
index ff8624505..a049ebd2b 100644
--- a/cloud-firestore/build.gradle.kts
+++ b/cloud-firestore/build.gradle.kts
@@ -2,16 +2,11 @@ plugins {
     id("io.ashdavies.kotlin")
 }
 
-configurations.all {
-    resolutionStrategy.capabilitiesResolution.withCapability("${libs.google.guava.listenablefuture.get()}") {
-        select(candidates.first { !it.id.displayName.contains("empty") })
-    }
-}
-
 kotlin {
     jvmMain.dependencies {
         implementation(dependencies.platform(libs.google.cloud.bom))
         implementation(libs.google.cloud.firestore)
         implementation(libs.google.firebase.admin)
+        implementation(libs.google.guava.jre)
     }
 }
diff --git a/cloud-run/build.gradle.kts b/cloud-run/build.gradle.kts
index 701e85d50..d6705088a 100644
--- a/cloud-run/build.gradle.kts
+++ b/cloud-run/build.gradle.kts
@@ -13,12 +13,6 @@ application {
     mainClass.set("io.ashdavies.cloud.MainKt")
 }
 
-configurations.all {
-    resolutionStrategy.capabilitiesResolution.withCapability("${libs.google.guava.listenablefuture.get()}") {
-        select(candidates.first { !it.id.displayName.contains("empty") })
-    }
-}
-
 jib {
     container.mainClass = application.mainClass.get()
 }
@@ -40,8 +34,8 @@ kotlin {
             implementation(dependencies.platform(cloud.bom))
             implementation(cloud.firestore)
             implementation(cloud.storage)
-
             implementation(firebase.admin)
+            implementation(guava.jre)
         }
 
         with(libs.jetbrains.kotlinx) {
diff --git a/events-aggregator/build.gradle.kts b/events-aggregator/build.gradle.kts
index d7e935137..b6b4ac039 100644
--- a/events-aggregator/build.gradle.kts
+++ b/events-aggregator/build.gradle.kts
@@ -4,9 +4,11 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.cloudFirestore)
-    implementation(projects.localStorage)
-    implementation(projects.microYaml)
+    with(projects) {
+        implementation(cloudFirestore)
+        implementation(localStorage)
+        implementation(microYaml)
+    }
 
-    testImplementation(libs.ktor.client.core)
+    implementation(libs.google.guava.jre)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e20f71db6..928eba8f4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ apollo-graphql-runtime = { module = "com.apollographql.apollo:apollo-runtime", v
 app-cash-turbine = "app.cash.turbine:turbine:1.0.0"
 
 auth-java-jwt = "com.auth0:java-jwt:4.4.0"
-auth-jwks-rsa = "com.auth0:jwks-rsa:0.22.0"
+auth-jwks-rsa = "com.auth0:jwks-rsa:0.22.1"
 
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-kt" }
 coil-core = { module = "io.coil-kt:coil", version.ref = "coil-kt" }
@@ -59,7 +59,7 @@ google-firebase-appcheck-debug = { module = "com.google.firebase:firebase-appche
 google-firebase-appcheck-playintegrity = { module = "com.google.firebase:firebase-appcheck-playintegrity" }
 google-firebase-common-ktx = { module = "com.google.firebase:firebase-common-ktx" }
 google-firebase-auth-ktx = { module = "com.google.firebase:firebase-auth-ktx" }
-google-guava-listenablefuture = "com.google.guava:listenablefuture:1.0"
+google-guava-jre = "com.google.guava:guava:32.1.1-jre"
 google-maps-android-compose = { module = "com.google.maps.android:maps-compose", version.ref = "google-maps-compose" }
 google-maps-android-compose-widgets = { module = "com.google.maps.android:maps-compose-widgets", version.ref = "google-maps-compose" }