diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eeacfe1..f28be94 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Sep 17 03:10:52 EDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/io/github/atriusx/Compositor.kt b/src/main/kotlin/io/github/atriusx/Compositor.kt
index 9abde9d..4a462e1 100644
--- a/src/main/kotlin/io/github/atriusx/Compositor.kt
+++ b/src/main/kotlin/io/github/atriusx/Compositor.kt
@@ -3,10 +3,10 @@ package io.github.atriusx
 import org.gradle.api.Plugin
 import org.gradle.api.artifacts.DependencySubstitutions
 import org.gradle.api.initialization.Settings
-import org.gradle.internal.cc.base.logger
 import io.github.atriusx.config.CompositesConfig
 import io.github.atriusx.util.CompositesUtil.getCompositesFile
 import io.github.atriusx.util.YamlUtil
+import org.slf4j.LoggerFactory
 
 /**
  * @author Atrius
@@ -63,4 +63,10 @@ class Compositor : Plugin<Settings> {
     private fun Settings.applyProjectPlugin() = gradle.beforeProject {
         it.pluginManager.apply(CompositorProjectAuto::class.java)
     }
+
+    companion object {
+
+        private val logger = LoggerFactory
+            .getLogger(Compositor::class.java)
+    }
 }
diff --git a/src/main/kotlin/io/github/atriusx/CompositorProjectAuto.kt b/src/main/kotlin/io/github/atriusx/CompositorProjectAuto.kt
index 0ba0614..924ae32 100644
--- a/src/main/kotlin/io/github/atriusx/CompositorProjectAuto.kt
+++ b/src/main/kotlin/io/github/atriusx/CompositorProjectAuto.kt
@@ -2,11 +2,11 @@ package io.github.atriusx
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.internal.cc.base.logger
 import io.github.atriusx.config.CompositesConfig
 import io.github.atriusx.util.CompositesUtil
 import io.github.atriusx.util.CompositesUtil.getCompositesFile
 import io.github.atriusx.util.YamlUtil
+import org.slf4j.LoggerFactory
 import java.io.File
 
 /**
@@ -74,4 +74,10 @@ class CompositorProjectAuto : Plugin<Project> {
         // Save content back to file
         YamlUtil.write(file, composites)
     }
+
+    companion object {
+
+        private val logger = LoggerFactory
+            .getLogger(CompositorProjectAuto::class.java.name)
+    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/io/github/atriusx/util/YamlUtil.kt b/src/main/kotlin/io/github/atriusx/util/YamlUtil.kt
index 8a88a8a..d3ec54f 100644
--- a/src/main/kotlin/io/github/atriusx/util/YamlUtil.kt
+++ b/src/main/kotlin/io/github/atriusx/util/YamlUtil.kt
@@ -2,7 +2,7 @@ package io.github.atriusx.util
 
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper
-import org.gradle.internal.cc.base.logger
+import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.IOException
 import kotlin.reflect.KClass
@@ -28,4 +28,7 @@ object YamlUtil {
         logger.debug("Writing provided content to ${file.name}...")
         yaml.writeValue(file, value)
     }
+
+    private val logger = LoggerFactory
+        .getLogger(YamlUtil::class.java)
 }
\ No newline at end of file
diff --git a/src/test/kotlin/io/github/atriusx/config/CompositesConfigTest.kt b/src/test/kotlin/io/github/atriusx/config/CompositesConfigTest.kt
index 7c14932..4950ad0 100644
--- a/src/test/kotlin/io/github/atriusx/config/CompositesConfigTest.kt
+++ b/src/test/kotlin/io/github/atriusx/config/CompositesConfigTest.kt
@@ -139,5 +139,28 @@ class CompositesConfigTest : DescribeSpec({
                 )
             }
         }
+
+        describe("When importing multiple subprojects") {
+            val content = """
+                |composites:
+                |  foo.bar.baz:
+                |    dependency-a: "../multi:dependency-a"
+                |    dependency-b: "../multi:dependency-b"
+            """.trimMargin()
+            val composites = yaml
+                .readValue(content, CompositesConfig::class.java)
+                .processQualifiers()
+
+            it("Should resolve multiple composites") {
+                composites.size shouldBe 2
+            }
+
+            it("Should resolve the correct mappings") {
+                composites
+                    .shouldContain("foo.bar.baz:dependency-a" to "../multi:dependency-a",)
+                composites
+                    .shouldContain("foo.bar.baz:dependency-b" to "../multi:dependency-b",)
+            }
+        }
     }
 })