diff --git a/core/build.gradle b/core/build.gradle
index f2fe5c1ea1..0cffc580dc 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -189,8 +189,8 @@ publishing {
     publications {
         maven(MavenPublication) {
             artifactId 'corda-core'
-            artifact(testJar)
-            artifact(jar)
+            artifact testJar
+            from components.java
         }
     }
 }
diff --git a/node/capsule/build.gradle b/node/capsule/build.gradle
index d012d8e46e..fe62ce33d0 100644
--- a/node/capsule/build.gradle
+++ b/node/capsule/build.gradle
@@ -93,6 +93,7 @@ publishing {
             artifact(buildCordaJAR) {
                 classifier ''
             }
+            from components.java
         }
     }
 }
diff --git a/opentelemetry/opentelemetry-driver/build.gradle b/opentelemetry/opentelemetry-driver/build.gradle
index 0aa9ee8b17..b8fc145051 100644
--- a/opentelemetry/opentelemetry-driver/build.gradle
+++ b/opentelemetry/opentelemetry-driver/build.gradle
@@ -25,7 +25,8 @@ publishing {
     publications {
         shadow(MavenPublication) { publication ->
             artifactId 'corda-opentelemetry-driver'
-            project.shadow.component(publication)
+            artifact shadowJar
+            from components.java
         }
     }
 }
diff --git a/serialization/build.gradle b/serialization/build.gradle
index 7393bae2e7..6192d30da2 100644
--- a/serialization/build.gradle
+++ b/serialization/build.gradle
@@ -75,7 +75,7 @@ publishing {
         maven(MavenPublication) {
             artifactId 'corda-serialization'
             artifact(testJar)
-            artifact(jar)
+            from components.java
         }
     }
 }
diff --git a/testing/testserver/testcapsule/build.gradle b/testing/testserver/testcapsule/build.gradle
index 2566200495..f0c678fdf0 100644
--- a/testing/testserver/testcapsule/build.gradle
+++ b/testing/testserver/testcapsule/build.gradle
@@ -72,6 +72,7 @@ publishing {
             artifact(buildWebserverJar) {
                 classifier ''
             }
+            from components.java
         }
     }
 }
diff --git a/tools/explorer/capsule/build.gradle b/tools/explorer/capsule/build.gradle
index add8010d28..75a019f15b 100644
--- a/tools/explorer/capsule/build.gradle
+++ b/tools/explorer/capsule/build.gradle
@@ -47,6 +47,7 @@ publishing {
             artifact(buildExplorerJAR) {
                 classifier ''
             }
+            from components.java
         }
     }
 }