diff --git a/core/identity-hub-client/build.gradle.kts b/core/identity-hub-client/build.gradle.kts
index 0d3439745..66718d324 100644
--- a/core/identity-hub-client/build.gradle.kts
+++ b/core/identity-hub-client/build.gradle.kts
@@ -33,11 +33,3 @@ dependencies {
     testImplementation(edc.core.junit)
     testImplementation(edc.core.identity.did)
 }
-
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}
diff --git a/core/identity-hub-verifier/build.gradle.kts b/core/identity-hub-credentials-verifier/build.gradle.kts
similarity index 80%
rename from core/identity-hub-verifier/build.gradle.kts
rename to core/identity-hub-credentials-verifier/build.gradle.kts
index 967cf75e7..d2d47175a 100644
--- a/core/identity-hub-verifier/build.gradle.kts
+++ b/core/identity-hub-credentials-verifier/build.gradle.kts
@@ -32,12 +32,3 @@ dependencies {
     testImplementation(edc.core.identity.did)
     testImplementation(edc.core.junit)
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("identity-hub-credentials-verifier") {
-            artifactId = "identity-hub-credentials-verifier"
-            from(components["java"])
-        }
-    }
-}
diff --git a/core/identity-hub-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/AggregatedResult.java b/core/identity-hub-credentials-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/AggregatedResult.java
similarity index 100%
rename from core/identity-hub-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/AggregatedResult.java
rename to core/identity-hub-credentials-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/AggregatedResult.java
diff --git a/core/identity-hub-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/CredentialsVerifierExtension.java b/core/identity-hub-credentials-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/CredentialsVerifierExtension.java
similarity index 100%
rename from core/identity-hub-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/CredentialsVerifierExtension.java
rename to core/identity-hub-credentials-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/CredentialsVerifierExtension.java
diff --git a/core/identity-hub-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/IdentityHubCredentialsVerifier.java b/core/identity-hub-credentials-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/IdentityHubCredentialsVerifier.java
similarity index 100%
rename from core/identity-hub-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/IdentityHubCredentialsVerifier.java
rename to core/identity-hub-credentials-verifier/src/main/java/org/eclipse/edc/identityhub/verifier/IdentityHubCredentialsVerifier.java
diff --git a/core/identity-hub-verifier/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/core/identity-hub-credentials-verifier/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
similarity index 100%
rename from core/identity-hub-verifier/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
rename to core/identity-hub-credentials-verifier/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
diff --git a/core/identity-hub-verifier/src/test/java/org/eclipse/edc/identityhub/verifier/IdentityHubCredentialsVerifierTest.java b/core/identity-hub-credentials-verifier/src/test/java/org/eclipse/edc/identityhub/verifier/IdentityHubCredentialsVerifierTest.java
similarity index 100%
rename from core/identity-hub-verifier/src/test/java/org/eclipse/edc/identityhub/verifier/IdentityHubCredentialsVerifierTest.java
rename to core/identity-hub-credentials-verifier/src/test/java/org/eclipse/edc/identityhub/verifier/IdentityHubCredentialsVerifierTest.java
diff --git a/core/identity-hub/build.gradle.kts b/core/identity-hub/build.gradle.kts
index 22b98a585..1f1039305 100644
--- a/core/identity-hub/build.gradle.kts
+++ b/core/identity-hub/build.gradle.kts
@@ -28,12 +28,3 @@ dependencies {
     testImplementation(testFixtures(project(":spi:identity-hub-spi")))
     testImplementation(testFixtures(project(":spi:identity-hub-store-spi")))
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("identity-hub") {
-            artifactId = "identity-hub"
-            from(components["java"])
-        }
-    }
-}
diff --git a/extensions/credentials/identity-hub-credentials-jwt/build.gradle.kts b/extensions/credentials/identity-hub-credentials-jwt/build.gradle.kts
index c1d7190dd..2db9a4220 100644
--- a/extensions/credentials/identity-hub-credentials-jwt/build.gradle.kts
+++ b/extensions/credentials/identity-hub-credentials-jwt/build.gradle.kts
@@ -30,11 +30,3 @@ dependencies {
     testImplementation(edc.ext.identity.did.crypto)
     testImplementation(edc.core.junit)
 }
-
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}
diff --git a/extensions/identity-hub-api/build.gradle.kts b/extensions/identity-hub-api/build.gradle.kts
index d4e810be8..5cf6b9c45 100644
--- a/extensions/identity-hub-api/build.gradle.kts
+++ b/extensions/identity-hub-api/build.gradle.kts
@@ -35,13 +35,3 @@ dependencies {
     testImplementation(testFixtures(project(":spi:identity-hub-spi")))
     testImplementation(testFixtures(project(":spi:identity-hub-store-spi")))
 }
-
-
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}
-
diff --git a/extensions/identity-hub-verifier-jwt/build.gradle.kts b/extensions/identity-hub-verifier-jwt/build.gradle.kts
index aeac3792f..af5151e1d 100644
--- a/extensions/identity-hub-verifier-jwt/build.gradle.kts
+++ b/extensions/identity-hub-verifier-jwt/build.gradle.kts
@@ -30,17 +30,11 @@ dependencies {
 
     testImplementation(testFixtures(project(":spi:identity-hub-spi")))
     testImplementation(project(":extensions:identity-hub-api"))
-    testImplementation(project(":core:identity-hub-verifier"))
+    testImplementation(project(":core:identity-hub-credentials-verifier"))
 
     testImplementation(edc.ext.identity.did.crypto)
     testImplementation(edc.core.identity.did)
     testImplementation(edc.core.junit)
 }
 
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}
+
diff --git a/extensions/self-description-api/build.gradle.kts b/extensions/self-description-api/build.gradle.kts
index 3846a6d0e..67b73326d 100644
--- a/extensions/self-description-api/build.gradle.kts
+++ b/extensions/self-description-api/build.gradle.kts
@@ -25,13 +25,3 @@ dependencies {
     testImplementation(edc.core.junit)
     testImplementation(libs.restAssured)
 }
-
-
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}
-
diff --git a/extensions/store/cosmos/identity-hub-store-cosmos/build.gradle.kts b/extensions/store/cosmos/identity-hub-store-cosmos/build.gradle.kts
index 24cc242dd..a0f25cd14 100644
--- a/extensions/store/cosmos/identity-hub-store-cosmos/build.gradle.kts
+++ b/extensions/store/cosmos/identity-hub-store-cosmos/build.gradle.kts
@@ -27,12 +27,3 @@ dependencies {
     testImplementation(testFixtures(edc.ext.azure.test))
 
 }
-
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}
-
diff --git a/extensions/store/sql/identity-hub-store-sql/build.gradle.kts b/extensions/store/sql/identity-hub-store-sql/build.gradle.kts
index a890cf34e..d50a71c21 100644
--- a/extensions/store/sql/identity-hub-store-sql/build.gradle.kts
+++ b/extensions/store/sql/identity-hub-store-sql/build.gradle.kts
@@ -13,11 +13,3 @@ dependencies {
     testImplementation(testFixtures(project(":spi:identity-hub-store-spi")))
     testImplementation(libs.postgres)
 }
-
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}
diff --git a/client-cli/README.md b/identity-hub-cli/README.md
similarity index 100%
rename from client-cli/README.md
rename to identity-hub-cli/README.md
diff --git a/client-cli/build.gradle.kts b/identity-hub-cli/build.gradle.kts
similarity index 84%
rename from client-cli/build.gradle.kts
rename to identity-hub-cli/build.gradle.kts
index 6ba7639ae..1c2ef2ae2 100644
--- a/client-cli/build.gradle.kts
+++ b/identity-hub-cli/build.gradle.kts
@@ -34,12 +34,3 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
     mergeServiceFiles()
     archiveFileName.set("identity-hub-cli.jar")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("identity-hub-cli") {
-            artifactId = "identity-hub-cli"
-            from(components["java"])
-        }
-    }
-}
diff --git a/client-cli/src/main/java/org/eclipse/edc/identityhub/cli/AddVerifiableCredentialCommand.java b/identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/AddVerifiableCredentialCommand.java
similarity index 100%
rename from client-cli/src/main/java/org/eclipse/edc/identityhub/cli/AddVerifiableCredentialCommand.java
rename to identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/AddVerifiableCredentialCommand.java
diff --git a/client-cli/src/main/java/org/eclipse/edc/identityhub/cli/CliException.java b/identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/CliException.java
similarity index 100%
rename from client-cli/src/main/java/org/eclipse/edc/identityhub/cli/CliException.java
rename to identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/CliException.java
diff --git a/client-cli/src/main/java/org/eclipse/edc/identityhub/cli/CryptoUtils.java b/identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/CryptoUtils.java
similarity index 100%
rename from client-cli/src/main/java/org/eclipse/edc/identityhub/cli/CryptoUtils.java
rename to identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/CryptoUtils.java
diff --git a/client-cli/src/main/java/org/eclipse/edc/identityhub/cli/IdentityHubCli.java b/identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/IdentityHubCli.java
similarity index 100%
rename from client-cli/src/main/java/org/eclipse/edc/identityhub/cli/IdentityHubCli.java
rename to identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/IdentityHubCli.java
diff --git a/client-cli/src/main/java/org/eclipse/edc/identityhub/cli/ListVerifiableCredentialsCommand.java b/identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/ListVerifiableCredentialsCommand.java
similarity index 100%
rename from client-cli/src/main/java/org/eclipse/edc/identityhub/cli/ListVerifiableCredentialsCommand.java
rename to identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/ListVerifiableCredentialsCommand.java
diff --git a/client-cli/src/main/java/org/eclipse/edc/identityhub/cli/VerifiableCredentialsCommand.java b/identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/VerifiableCredentialsCommand.java
similarity index 100%
rename from client-cli/src/main/java/org/eclipse/edc/identityhub/cli/VerifiableCredentialsCommand.java
rename to identity-hub-cli/src/main/java/org/eclipse/edc/identityhub/cli/VerifiableCredentialsCommand.java
diff --git a/client-cli/src/test/java/org/eclipse/edc/identityhub/cli/CliTestUtils.java b/identity-hub-cli/src/test/java/org/eclipse/edc/identityhub/cli/CliTestUtils.java
similarity index 100%
rename from client-cli/src/test/java/org/eclipse/edc/identityhub/cli/CliTestUtils.java
rename to identity-hub-cli/src/test/java/org/eclipse/edc/identityhub/cli/CliTestUtils.java
diff --git a/client-cli/src/test/java/org/eclipse/edc/identityhub/cli/VerifiableCredentialsCommandTest.java b/identity-hub-cli/src/test/java/org/eclipse/edc/identityhub/cli/VerifiableCredentialsCommandTest.java
similarity index 100%
rename from client-cli/src/test/java/org/eclipse/edc/identityhub/cli/VerifiableCredentialsCommandTest.java
rename to identity-hub-cli/src/test/java/org/eclipse/edc/identityhub/cli/VerifiableCredentialsCommandTest.java
diff --git a/client-cli/src/test/resources/test-private-key.pem b/identity-hub-cli/src/test/resources/test-private-key.pem
similarity index 100%
rename from client-cli/src/test/resources/test-private-key.pem
rename to identity-hub-cli/src/test/resources/test-private-key.pem
diff --git a/client-cli/src/test/resources/test-public-key.pem b/identity-hub-cli/src/test/resources/test-public-key.pem
similarity index 100%
rename from client-cli/src/test/resources/test-public-key.pem
rename to identity-hub-cli/src/test/resources/test-public-key.pem
diff --git a/launcher/build.gradle.kts b/launcher/build.gradle.kts
index 94773fb8a..bcfe26325 100644
--- a/launcher/build.gradle.kts
+++ b/launcher/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
 
 dependencies {
     implementation(project(":core:identity-hub"))
-    implementation(project(":core:identity-hub-verifier"))
+    implementation(project(":core:identity-hub-credentials-verifier"))
     implementation(project(":extensions:identity-hub-api"))
     implementation(project(":extensions:self-description-api"))
     implementation(edc.ext.observability)
@@ -37,3 +37,7 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
     mergeServiceFiles()
     archiveFileName.set("identity-hub.jar")
 }
+
+edcBuild {
+    publish.set(false)
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7bef80442..49f425fe2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -51,16 +51,16 @@ dependencyResolutionManagement {
     }
 }
 
-include(":client-cli")
 include(":core:identity-hub")
 include(":core:identity-hub-client")
-include(":core:identity-hub-verifier")
+include(":core:identity-hub-credentials-verifier")
 include(":extensions:credentials:identity-hub-credentials-jwt")
 include(":extensions:identity-hub-api")
 include(":extensions:identity-hub-verifier-jwt")
 include(":extensions:self-description-api")
 include(":extensions:store:cosmos:identity-hub-store-cosmos")
 include(":extensions:store:sql:identity-hub-store-sql")
+include(":identity-hub-cli")
 include(":launcher")
 include(":spi:identity-hub-client-spi")
 include(":spi:identity-hub-spi")
diff --git a/spi/identity-hub-client-spi/build.gradle.kts b/spi/identity-hub-client-spi/build.gradle.kts
index a913f40ad..c3e133242 100644
--- a/spi/identity-hub-client-spi/build.gradle.kts
+++ b/spi/identity-hub-client-spi/build.gradle.kts
@@ -23,13 +23,3 @@ dependencies {
     api(project(":spi:identity-hub-spi"))
     implementation(libs.nimbus.jwt)
 }
-
-
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}
-
diff --git a/spi/identity-hub-spi/build.gradle.kts b/spi/identity-hub-spi/build.gradle.kts
index 214cdc5c7..8805b5839 100644
--- a/spi/identity-hub-spi/build.gradle.kts
+++ b/spi/identity-hub-spi/build.gradle.kts
@@ -33,11 +33,3 @@ dependencies {
     testFixturesImplementation(libs.nimbus.jwt)
     testFixturesImplementation(edc.spi.identity.did)
 }
-
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}
diff --git a/spi/identity-hub-store-spi/build.gradle.kts b/spi/identity-hub-store-spi/build.gradle.kts
index 085af6fac..2fc27550c 100644
--- a/spi/identity-hub-store-spi/build.gradle.kts
+++ b/spi/identity-hub-store-spi/build.gradle.kts
@@ -14,11 +14,3 @@ dependencies {
     testFixturesImplementation(libs.nimbus.jwt)
     testFixturesImplementation(libs.jackson.databind)
 }
-
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}
diff --git a/system-tests/build.gradle.kts b/system-tests/build.gradle.kts
index 8e36acfcc..49fd489ad 100644
--- a/system-tests/build.gradle.kts
+++ b/system-tests/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     api(project(":spi:identity-hub-spi"))
     api(edc.spi.identity.did)
     testImplementation(project(":launcher"))
-    testImplementation(project(":client-cli"))
+    testImplementation(project(":identity-hub-cli"))
 
     testImplementation(edc.core.junit)
 
@@ -32,3 +32,7 @@ dependencies {
     testImplementation(libs.nimbus.jwt)
 }
 
+edcBuild {
+    publish.set(false)
+}
+