diff --git a/gradle/build-logic/src/main/kotlin/conventions.base.gradle.kts b/gradle/build-logic/src/main/kotlin/conventions.base.gradle.kts
index a7afd05c..02e9e496 100644
--- a/gradle/build-logic/src/main/kotlin/conventions.base.gradle.kts
+++ b/gradle/build-logic/src/main/kotlin/conventions.base.gradle.kts
@@ -1,3 +1,5 @@
+import org.incendo.cloudbuildlogic.ciBuild
+
 plugins {
     id("org.incendo.cloud-build-logic")
     id("org.incendo.cloud-build-logic.spotless")
@@ -18,6 +20,14 @@ cloudSpotless {
     ktlintVersion.set(libs.versions.ktlint)
 }
 
+if (providers.ciBuild.get() && libs.versions.cloudCore.get().endsWith("-SNAPSHOT")) {
+    configurations.all {
+        resolutionStrategy {
+            cacheChangingModulesFor(1, TimeUnit.MINUTES)
+        }
+    }
+}
+
 dependencies {
     checkstyle(libs.stylecheck)
     errorprone(libs.errorproneCore)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9427906f..3cf7d430 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ ktlint = "0.50.0"
 errorprone = "2.24.1"
 run-task = "2.2.2"
 
-cloud = "2.0.0-SNAPSHOT"
+cloudCore = "2.0.0-SNAPSHOT"
 
 immutables = "2.10.0"
 
@@ -34,9 +34,9 @@ cloud-build-logic = { module = "org.incendo:cloud-build-logic", version.ref = "c
 stylecheck = { module = "ca.stellardrift:stylecheck", version.ref = "stylecheck" }
 errorproneCore = { group = "com.google.errorprone", name = "error_prone_core", version.ref = "errorprone" }
 
-cloud-bom = { module = "cloud.commandframework:cloud-bom", version.ref = "cloud" }
-cloud-core = { module = "cloud.commandframework:cloud-core", version.ref = "cloud" }
-cloud-annotations = { module = "cloud.commandframework:cloud-annotations", version.ref = "cloud" }
+cloud-bom = { module = "cloud.commandframework:cloud-bom", version.ref = "cloudCore" }
+cloud-core = { module = "cloud.commandframework:cloud-core", version.ref = "cloudCore" }
+cloud-annotations = { module = "cloud.commandframework:cloud-annotations", version.ref = "cloudCore" }
 
 immutables = { group = "org.immutables", name = "value", version.ref = "immutables" }
 immutablesAnnotate = { group = "org.immutables", name = "annotate", version.ref = "immutables" }