diff --git a/components/settings.gradle.kts b/components/settings.gradle.kts
index 055bf57049..91226db8a8 100644
--- a/components/settings.gradle.kts
+++ b/components/settings.gradle.kts
@@ -4,6 +4,9 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        if (extra["compose.useMavenLocal"] == "true") {
+            mavenLocal()
+        }
     }
 
     plugins {
@@ -16,6 +19,9 @@ pluginManagement {
 
 dependencyResolutionManagement {
     repositories {
+        if (extra["compose.useMavenLocal"] == "true") {
+            mavenLocal() // mavenLocal should be the first to get the correct version of skiko during a local build.
+        }
         google()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
diff --git a/compose/scripts/publishComponentsToMavenLocal b/compose/scripts/publishComponentsToMavenLocal
index 34e97cc777..657df615ab 100755
--- a/compose/scripts/publishComponentsToMavenLocal
+++ b/compose/scripts/publishComponentsToMavenLocal
@@ -8,6 +8,6 @@ if [[ -z "$COMPOSE_CUSTOM_VERSION" ]]; then
 fi
 
 pushd ../../components
-./gradlew publishToMavenLocal -Pcompose.version="$COMPOSE_CUSTOM_VERSION"  || exit 1
+./gradlew publishToMavenLocal -Pcompose.version="$COMPOSE_CUSTOM_VERSION" -Pcompose.useMavenLocal=true || exit 1
 popd