diff --git a/src/main/groovy/io/micronaut/build/MicronautBuildCommonPlugin.groovy b/src/main/groovy/io/micronaut/build/MicronautBuildCommonPlugin.groovy
index 4a472b1c..8ddf099c 100644
--- a/src/main/groovy/io/micronaut/build/MicronautBuildCommonPlugin.groovy
+++ b/src/main/groovy/io/micronaut/build/MicronautBuildCommonPlugin.groovy
@@ -54,6 +54,7 @@ class MicronautBuildCommonPlugin implements Plugin<Project> {
                         throw new GradleException("Do not use enforcedPlatform. Please remove the micronautBuild.enforcedPlatform setting")
                     }
                     String p = "platform"
+                    implementation "$p"("io.micronaut:micronaut-bom:${micronautVersion}")
                     annotationProcessor "$p"("io.micronaut:micronaut-bom:${micronautVersion}")
                     testAnnotationProcessor "$p"("io.micronaut:micronaut-bom:${micronautVersion}")
                     testImplementation "$p"("io.micronaut:micronaut-bom:${micronautVersion}")
diff --git a/src/main/groovy/io/micronaut/build/MicronautPublishingPlugin.groovy b/src/main/groovy/io/micronaut/build/MicronautPublishingPlugin.groovy
index a79cb54e..a6ba1181 100644
--- a/src/main/groovy/io/micronaut/build/MicronautPublishingPlugin.groovy
+++ b/src/main/groovy/io/micronaut/build/MicronautPublishingPlugin.groovy
@@ -101,7 +101,7 @@ class MicronautPublishingPlugin implements Plugin<Project> {
 
                                 versionMapping {
                                     usage('java-api') {
-                                        fromResolutionResult()
+                                        fromResolutionOf('runtimeClasspath')
                                     }
                                     usage('java-runtime') {
                                         fromResolutionResult()