diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 25603431..aa31cf5a 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -129,3 +129,15 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: eclipse-edc/.github/.github/workflows/verify-openapi.yml@main
     secrets: inherit
+
+  Verify-FC-BOM:
+    strategy:
+      fail-fast: false
+
+      # we can't test the "controlplane-oauth2-com" because it only starts successfully if the public key is already in the vault
+      matrix:
+        bom-directory: [ "dist/bom/federatedcatalog-dcp-bom" ]
+    uses: eclipse-edc/.github/.github/workflows/verify-bom.yml@main
+    with:
+      module-dir: ${{ matrix.bom-directory }}
+      properties-file: example.properties
\ No newline at end of file
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 995d0ff1..181417b5 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -17,17 +17,17 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.1, Apache-2.
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.18.0, Apache-2.0, approved, #16372
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.16.2, Apache-2.0, approved, #11855
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.18.0, Apache-2.0, approved, #16370
-maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.18.0, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.18.0, Apache-2.0, approved, #16622
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.16.2, Apache-2.0, approved, #11853
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.2, Apache-2.0, approved, #14160
-maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.18.0, , restricted, clearlydefined
-maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.18.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.18.0, Apache-2.0, approved, #16625
+maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.18.0, Apache-2.0, approved, #16626
 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.16.2, Apache-2.0, approved, #11858
-maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.18.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.18.0, Apache-2.0, approved, #16623
 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.1, Apache-2.0, approved, #13668
 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.18.0, Apache-2.0, approved, #16368
 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.16.2, Apache-2.0, approved, #11852
-maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.18.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.18.0, Apache-2.0, approved, #16628
 maven/mavencentral/com.github.docker-java/docker-java-api/3.4.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.4.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #15745
 maven/mavencentral/com.github.docker-java/docker-java-transport/3.4.0, Apache-2.0, approved, clearlydefined
@@ -107,6 +107,7 @@ maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved
 maven/mavencentral/org.apache.commons/commons-lang3/3.14.0, Apache-2.0, approved, #11677
 maven/mavencentral/org.apache.commons/commons-lang3/3.7, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.apache.commons/commons-lang3/3.8.1, Apache-2.0, approved, #815
+maven/mavencentral/org.apache.commons/commons-pool2/2.12.0, Apache-2.0 AND LicenseRef-Public-Domain, approved, #10843
 maven/mavencentral/org.apache.commons/commons-text/1.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.apache.groovy/groovy-bom/4.0.22, Apache-2.0, approved, #9266
 maven/mavencentral/org.apache.groovy/groovy-json/4.0.22, Apache-2.0, approved, #7411
@@ -202,16 +203,10 @@ maven/mavencentral/org.eclipse.edc/identity-trust-core/0.10.0-SNAPSHOT, Apache-2
 maven/mavencentral/org.eclipse.edc/identity-trust-issuers-configuration/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/identity-trust-service/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/identity-trust-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/identity-trust-sts-api/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/identity-trust-sts-client-configuration/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/identity-trust-sts-core/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/identity-trust-sts-embedded/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/identity-trust-sts-remote-client/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/identity-trust-sts-remote-lib/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/identity-trust-sts-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/identity-trust-sts/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/identity-trust-transform/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/identity-trust/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/jersey-core/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/jetty-core/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -244,11 +239,13 @@ maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.10.0-SNAPSHOT, Apache-2.0
 maven/mavencentral/org.eclipse.edc/secrets-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/sql-bootstrapper/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/sql-core/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/state-machine-lib/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/store-lib/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/token-core/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/token-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-local/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/transaction-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/transfer-process-api/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -260,6 +257,7 @@ maven/mavencentral/org.eclipse.edc/validator-lib/0.10.0-SNAPSHOT, Apache-2.0, ap
 maven/mavencentral/org.eclipse.edc/validator-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/verifiable-credentials-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/verifiable-credentials/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/version-api/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/web-spi/0.10.0-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-servlet-api/5.0.2, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-websocket-api/2.0.0, EPL-2.0 OR Apache-2.0, approved, rt.jetty
@@ -311,8 +309,8 @@ maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.10, Apache-2.0, a
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.9.10, Apache-2.0, approved, #11827
 maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains/annotations/17.0.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.jetbrains/annotations/25.0.0, , restricted, clearlydefined
-maven/mavencentral/org.jetbrains/annotations/26.0.0, , restricted, clearlydefined
+maven/mavencentral/org.jetbrains/annotations/25.0.0, Apache-2.0, approved, #16624
+maven/mavencentral/org.jetbrains/annotations/26.0.0, Apache-2.0, approved, #16629
 maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.11.0, EPL-2.0, approved, #15935
 maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.11.1, EPL-2.0, approved, #15935
 maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.11.2, EPL-2.0, approved, #15935
@@ -342,10 +340,10 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.25, MIT, approved, CQ13368
 maven/mavencentral/org.slf4j/slf4j-api/1.7.30, MIT, approved, CQ13368
 maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368
 maven/mavencentral/org.slf4j/slf4j-api/2.0.9, MIT, approved, #5915
-maven/mavencentral/org.testcontainers/database-commons/1.20.2, , restricted, clearlydefined
-maven/mavencentral/org.testcontainers/jdbc/1.20.2, , restricted, clearlydefined
+maven/mavencentral/org.testcontainers/database-commons/1.20.2, Apache-2.0, approved, #16630
+maven/mavencentral/org.testcontainers/jdbc/1.20.2, Apache-2.0, approved, #16621
 maven/mavencentral/org.testcontainers/junit-jupiter/1.20.2, None, restricted, #16552
-maven/mavencentral/org.testcontainers/postgresql/1.20.2, , restricted, clearlydefined
+maven/mavencentral/org.testcontainers/postgresql/1.20.2, None, restricted, #16627
 maven/mavencentral/org.testcontainers/testcontainers/1.20.2, MIT, approved, #15747
 maven/mavencentral/org.xmlresolver/xmlresolver/5.2.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232
diff --git a/launchers/catalog-base/build.gradle.kts b/dist/bom/federatedcatalog-base-bom/build.gradle.kts
similarity index 100%
rename from launchers/catalog-base/build.gradle.kts
rename to dist/bom/federatedcatalog-base-bom/build.gradle.kts
diff --git a/dist/bom/federatedcatalog-dcp-bom/build.gradle.kts b/dist/bom/federatedcatalog-dcp-bom/build.gradle.kts
new file mode 100644
index 00000000..d9cb2091
--- /dev/null
+++ b/dist/bom/federatedcatalog-dcp-bom/build.gradle.kts
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *
+ */
+
+plugins {
+    `java-library`
+    id("application")
+    alias(libs.plugins.shadow)
+}
+
+dependencies {
+    runtimeOnly(project(":dist:bom:federatedcatalog-base-bom"))
+    runtimeOnly(libs.bundles.dcp)
+}
+
+application {
+    mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
+}
+
+tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
+    mergeServiceFiles()
+    archiveFileName.set("fc.jar")
+}
+
+edcBuild {
+    publish.set(false)
+}
diff --git a/dist/bom/federatedcatalog-dcp-bom/example.properties b/dist/bom/federatedcatalog-dcp-bom/example.properties
new file mode 100644
index 00000000..8e8c69ef
--- /dev/null
+++ b/dist/bom/federatedcatalog-dcp-bom/example.properties
@@ -0,0 +1,22 @@
+#
+#  Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#
+#  This program and the accompanying materials are made available under the
+#  terms of the Apache License, Version 2.0 which is available at
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+#  Contributors:
+#       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+#
+#
+edc.iam.sts.oauth.token.url=https://sts.com/token
+edc.iam.sts.oauth.client.id=test-clientid
+edc.iam.sts.oauth.client.secret.alias=test-alias
+web.http.port=8080
+web.http.path=/api
+web.http.catalog.port=8081
+web.http.catalog.path=/api/catalog
+edc.catalog.cache.execution.period.seconds=5
+edc.catalog.cache.execution.delay.seconds=0
\ No newline at end of file
diff --git a/dist/bom/federatedcatalog-feature-sql-bom/build.gradle.kts b/dist/bom/federatedcatalog-feature-sql-bom/build.gradle.kts
new file mode 100644
index 00000000..28257516
--- /dev/null
+++ b/dist/bom/federatedcatalog-feature-sql-bom/build.gradle.kts
@@ -0,0 +1,32 @@
+/*
+ *  Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *
+ */
+
+plugins {
+    `java-library`
+}
+
+dependencies {
+
+    // sql modules
+    api(project(":extensions:store:sql:federated-catalog-cache-sql"))
+    api(project(":extensions:store:sql:target-node-directory-sql"))
+
+    api(libs.edc.sql.core)
+    api(libs.edc.sql.pool)
+    api(libs.edc.sql.transactionlocal)
+    api(libs.edc.sql.bootstrapper)
+
+    // third-party deps
+    api(libs.postgres)
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0a7eaca9..d73b7f9b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,10 +9,12 @@ restAssured = "5.5.0"
 jackson = "2.17.2"
 jupiter = "5.11.0"
 assertj = "3.26.3"
+postgres = "42.7.4"
 
 [libraries]
 awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
 edc-api-management = { module = "org.eclipse.edc:management-api", version.ref = "edc" }
+edc-api-version = { module = "org.eclipse.edc:version-api", version.ref = "edc" }
 edc-api-management-config = { module = "org.eclipse.edc:management-api-configuration", version.ref = "edc" }
 edc-api-control-config = { module = "org.eclipse.edc:control-api-configuration", version.ref = "edc" }
 edc-api-observability = { module = "org.eclipse.edc:api-observability", version.ref = "edc" }
@@ -31,11 +33,19 @@ edc-dpf-selector-core = { module = "org.eclipse.edc:data-plane-selector-core", v
 edc-dpf-selector-spi = { module = "org.eclipse.edc:data-plane-selector-spi", version.ref = "edc" }
 edc-ext-http = { module = "org.eclipse.edc:http", version.ref = "edc" }
 edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" }
-edc-dcp = { module = "org.eclipse.edc:identity-trust", version.ref = "edc" }
+
+edc-dcp-core = { module = "org.eclipse.edc:identity-trust-core", version.ref = "edc" }
+edc-dcp-issuersconfig = { module = "org.eclipse.edc:identity-trust-issuers-configuration", version.ref = "edc" }
+edc-dcp-service = { module = "org.eclipse.edc:identity-trust-service", version.ref = "edc" }
+edc-dcp-transform = { module = "org.eclipse.edc:identity-trust-transform", version.ref = "edc" }
+edc-dcp-sts-client = { module = "org.eclipse.edc:identity-trust-sts-remote-client", version.ref = "edc" }
+
 edc-did-core = { module = "org.eclipse.edc:identity-did-core", version.ref = "edc" }
 edc-did-web = { module = "org.eclipse.edc:identity-did-web", version.ref = "edc" }
 edc-oauth2-client = { module = "org.eclipse.edc:oauth2-client", version.ref = "edc" }
 edc-sql-core = { module = "org.eclipse.edc:sql-core", version.ref = "edc" }
+edc-sql-pool = { module = "org.eclipse.edc:sql-pool-apache-commons", version.ref = "edc" }
+edc-sql-transactionlocal = { module = "org.eclipse.edc:transaction-local", version.ref = "edc" }
 edc-sql-bootstrapper = { module = "org.eclipse.edc:sql-bootstrapper", version.ref = "edc" }
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
 edc-json-ld-lib = { module = "org.eclipse.edc:json-ld-lib", version.ref = "edc" }
@@ -72,11 +82,14 @@ edc-controlplane-transform = { module = "org.eclipse.edc:control-plane-transform
 jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
+postgres = { module = "org.postgresql:postgresql", version.ref = "postgres" }
 
 [bundles]
-edc-connector = ["edc-boot", "edc-core-connector", "edc-core-jersey", "edc-api-observability"]
+edc-connector = ["edc-boot", "edc-core-connector", "edc-core-jersey", "edc-api-observability", "edc-config-filesystem",
+    "edc-core-edrstore", "edc-api-version"]
 edc-dpf = ["edc-dpf-selector-spi", "edc-dpf-selector-core"]
-dcp = ["edc-dcp", "edc-did-core", "edc-did-web", "edc-oauth2-client"]
+dcp = ["edc-dcp-core", "edc-dcp-issuersconfig", "edc-dcp-service", "edc-dcp-sts-client", "edc-dcp-transform",
+    "edc-did-core", "edc-did-web", "edc-oauth2-client"]
 
 [plugins]
 shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
diff --git a/launchers/catalog-dcp/build.gradle.kts b/launchers/catalog-dcp/build.gradle.kts
index 8708c127..a6222c94 100644
--- a/launchers/catalog-dcp/build.gradle.kts
+++ b/launchers/catalog-dcp/build.gradle.kts
@@ -19,8 +19,7 @@ plugins {
 }
 
 dependencies {
-    runtimeOnly(project(":launchers:catalog-base"))
-    runtimeOnly(libs.bundles.dcp)
+    runtimeOnly(project(":dist:bom:federatedcatalog-dcp-bom"))
 }
 
 application {
diff --git a/launchers/catalog-mocked/build.gradle.kts b/launchers/catalog-mocked/build.gradle.kts
index 4e091bda..9c1a3d50 100644
--- a/launchers/catalog-mocked/build.gradle.kts
+++ b/launchers/catalog-mocked/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 }
 
 dependencies {
-    runtimeOnly(project(":launchers:catalog-base"))
+    runtimeOnly(project(":dist:bom:federatedcatalog-base-bom"))
 
     // this runtime contains the MockedIdentityService
     runtimeOnly(libs.edc.iam.mock)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5a188ecd..bb214b4e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,15 +10,18 @@ include(":core:common:lib:catalog-util-lib")
 include(":extensions:api:federated-catalog-api")
 include(":extensions:store:sql:target-node-directory-sql")
 include(":extensions:store:sql:federated-catalog-cache-sql")
-include(":launchers:catalog-base")
 include(":launchers:catalog-dcp")
 include(":launchers:catalog-mocked")
 include(":system-tests:component-tests")
 include(":system-tests:end2end-test:connector-runtime")
-include(":system-tests:end2end-test:catalog-runtime")
 include(":system-tests:end2end-test:e2e-junit-runner")
 include(":version-catalog")
 
+// BOM modules
+include(":dist:bom:federatedcatalog-base-bom")
+include(":dist:bom:federatedcatalog-dcp-bom")
+include(":dist:bom:federatedcatalog-feature-sql-bom")
+
 // this is needed to have access to snapshot builds of plugins
 pluginManagement {
     repositories {
diff --git a/system-tests/end2end-test/README.md b/system-tests/end2end-test/README.md
index 30c32e5f..667a6516 100644
--- a/system-tests/end2end-test/README.md
+++ b/system-tests/end2end-test/README.md
@@ -18,11 +18,11 @@ it is possible to run them in local dev environments, be aware of the more invol
 
 Please follow these steps in order to run the tests on a local dev environment.
 
-1. Build launchers: there are two submodules named `catalog-runtime` and `connector-runtimes`, which will produce
+1. Build launchers: there are two submodules named `catalog-dcp` and `connector-runtime`, which will produce
    executable JAR files that
    will later be used in docker containers. In order to build them, simply execute
    ```shell
-   ./gradlew :system-tests:end2end-test:catalog-runtime:shadowJar
+   ./gradlew :launchers:catalog-dcp:shadowJar
    ./gradlew :system-tests:end2end-test:connector-runtime:shadowJar
    ```
 
diff --git a/system-tests/end2end-test/catalog-runtime/build.gradle.kts b/system-tests/end2end-test/catalog-runtime/build.gradle.kts
index f6027e2c..a6222c94 100644
--- a/system-tests/end2end-test/catalog-runtime/build.gradle.kts
+++ b/system-tests/end2end-test/catalog-runtime/build.gradle.kts
@@ -19,21 +19,7 @@ plugins {
 }
 
 dependencies {
-    runtimeOnly(project(":core:federated-catalog-core"))
-    runtimeOnly(project(":extensions:api:federated-catalog-api"))
-    runtimeOnly(project(":spi:federated-catalog-spi"))
-    runtimeOnly(libs.edc.lib.util)
-    runtimeOnly(libs.edc.spi.jsonld)
-
-    runtimeOnly(libs.bundles.edc.connector)
-    runtimeOnly(libs.edc.core.controlplane)
-    runtimeOnly(libs.edc.core.jetty)
-    runtimeOnly(libs.edc.core.edrstore)
-    runtimeOnly(libs.edc.lib.providers.jersey)
-    runtimeOnly(libs.edc.lib.boot)
-
-    runtimeOnly(libs.edc.dsp.all)
-    runtimeOnly(libs.edc.iam.mock)
+    runtimeOnly(project(":dist:bom:federatedcatalog-dcp-bom"))
 }
 
 application {
diff --git a/system-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/FederatedCatalogTest.java b/system-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/FederatedCatalogTest.java
index 76d02726..087313c6 100644
--- a/system-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/FederatedCatalogTest.java
+++ b/system-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/FederatedCatalogTest.java
@@ -62,6 +62,7 @@
 import static org.eclipse.edc.connector.controlplane.transform.odrl.OdrlTransformersFactory.jsonObjectToOdrlTransformers;
 import static org.eclipse.edc.end2end.TestFunctions.createContractDef;
 import static org.eclipse.edc.end2end.TestFunctions.createPolicy;
+import static org.eclipse.edc.util.io.Ports.getFreePort;
 import static org.mockito.Mockito.mock;
 
 @EndToEndTest
@@ -108,10 +109,12 @@ class FederatedCatalogTest {
                     "web.http.protocol.path", CATALOG_PROTOCOL.path(),
                     "web.http.management.port", CATALOG_MANAGEMENT.port(),
                     "web.http.management.path", CATALOG_MANAGEMENT.path(),
+                    "web.http.version.port", getFreePort() + "",
+                    "web.http.version.path", "/.well-known/version",
                     "web.http.catalog.port", CATALOG_CATALOG.port(),
                     "web.http.catalog.path", CATALOG_CATALOG.path(),
                     "edc.web.rest.cors.headers", "origin,content-type,accept,authorization,x-api-key"),
-            ":system-tests:end2end-test:catalog-runtime"));
+            ":launchers:catalog-mocked"));
     private final TypeTransformerRegistry typeTransformerRegistry = new TypeTransformerRegistryImpl();
     private final ObjectMapper mapper = JacksonJsonLd.createObjectMapper();
     private final CatalogApiClient apiClient = new CatalogApiClient(CATALOG_CATALOG, CONNECTOR_MANAGEMENT, mapper, new TitaniumJsonLd(mock(Monitor.class)), typeTransformerRegistry);